Fixing issues where regex broke namings.