Fixed issue with reserved names.