fixed imports and names s.t. master compiles again