Switch naming scheme (step => update)