Removing leaving traces for the function calls
change the file guards to align with other names