DataTypes: name refactoring