Amend naming convention to preserve sorting