source fixes with imports and names