cleaning up naming, fixing conf issue