Remove static-ness of two routines
Correct failed rename