Already decided
Fixed some aliases