fixup naming and deps