Naming and second part of comments