renamed some functions to follow closer to Cocoa conventions