fix naming and comments