Updated to follow new naming convention
Removed cruft, updated to new naming convention