Changing to non-reserved words
Updated delete/import