Changed Names, fixed code spots