refs #6508 some refactoring and renaming