Rename utility methods to be less confusing