Stats/renaming

please pull after adapting frontend.