Renamings + addition of "else if" handling