some renames; guarded failure of oculus-detection