Renamed Entities to DataTypes