Reserved words syntax adjustment

+ These are only reserved words if they are on their own, and in our case, dashes are not word separators, so we must be explicit