Update Regex to be more specific to for replacement

Regex was too broad and would replace more than it should have.  Fixed
with better matching for keys.