Fix usage of reserved names