Fixed some silly naming issues.