Updating header guard names to COMENT_FILENAME (removing the double underscore)