pre refactor of classes in wasp lib so no _preceeding