Renamed some stuff and removed PhysicalProperties