Fixed the naming conflicts in 'create'