Updated to replace '.' with [dot] in keynames