Refactoring to use case more, fixed build
More conventional name