Renames and small fixes