Name refactoring / typedefs