Fixed some misstyped names
Random screw-arounds