FORGE-1399: renamed option names and added entities to auto-completion