minor fixes with naming