added (working) merchant check to naming validation. Code clean up needed.