Refactoring some left over names.