Merge "Handle keynames with special characters such as - and ."