Switched to more semantic naming