Major refactoring due to name change