Checking in minor changes due to rename of solution