closes #6 Removed -ng prefixes