Change to support cnamer= which should also be backwards compatible with it not being present
NOT TESTED