fixes with naming