refs #1108, rename some classes with better names, make a small change in rename command to return error instead of uassert