Improved title generator

Also renamed it.