diff --git a/CHANGELOG.md b/CHANGELOG.md
index c11d0bc55bfd..47eec03b9e13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed base class of `compas.geometry.Primitive` and `compas.geometry.Shape` to `compas.geometry.Geometry`.
 * `compas_blender.artists.RobotModelArtist.collection` can be assigned as a Blender collection or a name.
 * Generalized the parameter `color` of `compas_blender.draw_texts` and various label drawing methods.
+* Changed `compas.IPY` to `compas.RHINO` in `orientation_rhino`.
 
 ### Removed
 
diff --git a/src/compas/topology/__init__.py b/src/compas/topology/__init__.py
index 0bed4b7633b9..1c71306ae359 100644
--- a/src/compas/topology/__init__.py
+++ b/src/compas/topology/__init__.py
@@ -85,12 +85,13 @@
 )
 from .connectivity import adjacency_from_edges
 
-if compas.IPY:
+if compas.RHINO:
     from .orientation_rhino import (
         face_adjacency_rhino,
         unify_cycles_rhino
     )
-else:
+
+if not compas.IPY:
     from .orientation_numpy import (
         face_adjacency_numpy,
         unify_cycles_numpy
@@ -114,12 +115,13 @@
     'adjacency_from_edges'
 ]
 
-if compas.IPY:
+if compas.RHINO:
     __all__ += [
         'face_adjacency_rhino',
         'unify_cycles_rhino',
     ]
-else:
+
+if not compas.IPY:
     __all__ += [
         'face_adjacency_numpy',
         'unify_cycles_numpy',