Some additions and renames