Sync default calendar creation code with contacts app

Pre-requisite to changing default names for cal/contacts (or making customisable)