Replaced deprecated tags and updated form names