correcting a naming and ordering issue