Opts validation added. Some names changes.