Fixed bugs and made names consistent.