few renames and fixes