Fixed spelling, renamed ambiguous methods