Fixing up some rename issues