Fixed some nasty naming conventions!