Bugfix: Fixing inappropriate ordering of naming strategies

This re-ordering of naming strategies fixes a failing unit test, and is how the naming was originally intended to be done.