rename & cleanup
silence several warnings, three of which could've lead to data corruption