Attempted fix for devs/cats with non variable-safe names