Fixed naming issues from refactoring