Perhaps we should do a regex replace on the pattern '-\\d+$' in case the name ever changes?