Package rename fixes / cleanup