Fixed a naming / sorting issue