Removed camelcase for datatypes