Adding engines and refining naming conventions