Name refactoring
Name refactoring / typedefs