naming, fixes