minor renamings
first procfuse-amalgamation