Renamed operations etc. for tidiness.