more reserved names changed