Restored some spec names for consistency. Moved all uses of cordova APIs into specs.