change file name and category name to make it more Cocoa way