Address comments: rename to match coding standard
Address comments: fix types in comments