Added names and fixed comment ignore