Started name changing and small fixes