Fixing some stupid naming errors