Changed naming to be compliant with usual conventions