Remove possible reserved word usage