Rename some properties and methods to make it more sensible