Changed terminology for startup tests.
More renaming.
More renaming.
Module name renaming.