Rename and small fixes. Broken atm.