Refactoring + naming changes