Fix 1: few renaming and comments