Refactoring
Minor naming changes.