minor tweaks and naming convention fixes