Merges ahilles107:CS-4591 and CS-4591 together including changes to the naming convention