More cleanup & fixing, implement plugin rename when possible