The '-' is invalid so this replaces it with 'x'. For consistency this
also changes it in such a way that it is always appended so the hidden
issue like this won't happen again. It also makes the naming scheme
consistent.