Switch some names in sake of more readable code