diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63bea00f8..99e1a7f18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed `AttributeError` in `SurfaceModel`.
 * Updated example scripts.
 * Calling `process_joinery` in `SurfaceModel`.
+* Renamed `ShowSurfaceModelBeamType` to `ShowBeamsByCategory`.
+* Changed `SurfaceModel` component input handling to give warnings instead of errors.
 
 ### Removed
 
diff --git a/src/compas_timber/ghpython/components/CT_ShowBeamTypes/code.py b/src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/code.py
similarity index 100%
rename from src/compas_timber/ghpython/components/CT_ShowBeamTypes/code.py
rename to src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/code.py
diff --git a/src/compas_timber/ghpython/components/CT_ShowBeamTypes/icon.png b/src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/icon.png
similarity index 100%
rename from src/compas_timber/ghpython/components/CT_ShowBeamTypes/icon.png
rename to src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/icon.png
diff --git a/src/compas_timber/ghpython/components/CT_ShowBeamTypes/metadata.json b/src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/metadata.json
similarity index 94%
rename from src/compas_timber/ghpython/components/CT_ShowBeamTypes/metadata.json
rename to src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/metadata.json
index c7f0689b2..fd02ae3f5 100644
--- a/src/compas_timber/ghpython/components/CT_ShowBeamTypes/metadata.json
+++ b/src/compas_timber/ghpython/components/CT_ShowBeamsByCategory/metadata.json
@@ -1,5 +1,5 @@
 {
-    "name": "ShowSurfaceModelBeamTypes",
+    "name": "ShowBeamsByCategory",
     "nickname": "ShowBeamType",
     "category": "COMPAS Timber",
     "subcategory": "Show",