Homework 1 solution and other renamings

Should not conflict