rename configs to make a bit more sense
fix more serde