Compilation - Small fix on comments, start of a tweak for Naming