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

This reverts commit b23becf4a046a863b6b615a63196dabf1a874981.