Make file/function namings google compliant