renamed ToS headers to more logical ones