Bug fixes and renaming

Connor