Merge "Naming fix and add comments"