From 4a09e3ff1d3ef71c6b151b5c7deefc82529691c0 Mon Sep 17 00:00:00 2001
From: Peter Elliott <peter.e@hey.com>
Date: Mon, 8 May 2023 15:00:47 -0600
Subject: [PATCH] De-dupe with the fully qualified function name (#315)

* De-dupe with the fully qualified function name

* Fix indentation

* Fix detekt

* Renames in tests

* Remove temp code

* Revert "Renames in tests"

This reverts commit f8c435990c2b39866736b271a232d71b1da6a594.

* Only use the element name for file prefix

* Updating test code

---------

Co-authored-by: Vinay Gaba <vinaygaba@gmail.com>
---
 .../output/ShowkaseMetadata_.kt               | 16 ++++++++--------
 .../output/TestComposable1group1name1.kt}     |  4 ++--
 .../output/TestComposable2group2name2.kt}     |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  8 ++++----
 .../output/{colorname.kt => redcolorname.kt}  |  2 +-
 ...pographyname.kt => titletypographyname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt | 16 ++++++++--------
 .../output/TestComposable1group1name1.kt}     |  6 +++---
 ...name2.kt => TestComposable2group2name2.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  8 ++++----
 ...sortestingcolorname.kt => redcolorname.kt} |  2 +-
 ...pographyname.kt => titletypographyname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt | 11 +++++++----
 ...Composable1WrapperClassTestComposable1.kt} |  6 +++---
 ...Composable2DefaultGroupTestComposable2.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rtestinggroupname.kt => colorgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rClassname.kt => colorWrapperClassname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...rtestinggroupname.kt => colorgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rtestinggroupname.kt => colorgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...sortestinggroupname.kt => redgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  5 +++--
 ...mposableWithDefaultParametersgroupname.kt} |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...name2.kt => TestComposable1group2name2.kt} |  6 +++---
 ...eviewthemesHelloWorldPreviewlighttheme.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  7 ++++---
 ...eviewthemesHelloWorldPreviewlighttheme.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  7 ++++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...posablePreviewFontfontscaleslargefont1.kt} |  4 ++--
 ...mposablePreviewFontfontscalessmallfont.kt} |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt | 10 ++++++----
 ...kt => Componentcomponentgroupcomponent.kt} |  5 ++---
 ...reviewthemesHelloWorldPreviewdarktheme.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt | 12 +++++++-----
 ...ComponentfontscalesComponentlargefont1.kt} |  6 +++---
 ... ComponentfontscalesComponentsmallfont.kt} |  6 +++---
 ...reviewthemesHelloWorldPreviewdarktheme.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt | 19 ++++++++++++-------
 ...reviewthemesHelloWorldPreviewdarktheme.kt} |  6 +++---
 ...viewthemesHelloWorldPreviewlighttheme1.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt | 14 ++++++++------
 ...rbnb_android_showkase_processor_testing.kt | 12 ++++++++----
 ...howkaseComposablesfontscaleslargefont1.kt} |  4 ++--
 ...ShowkaseComposablesfontscalessmallfont.kt} |  4 ++--
 ...reviewthemesHelloWorldPreviewdarktheme.kt} |  6 +++---
 ...viewthemesHelloWorldPreviewlighttheme1.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt | 14 ++++++++------
 ...airbnb_android_showkase_browser_testing.kt | 13 ++++++++-----
 ...ageofanintegerpreviewparameterprovider.kt} |  5 ++---
 ...e2Usageofacharpreviewparameterprovider.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  8 ++++----
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  6 ++++--
 ...stComposableWrapperClassTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 .../output/TestComposable1group1name1.kt}     |  6 +++---
 .../output/TestComposable2group1name2.kt}     |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 ...name1.kt => TestComposable1group1name1.kt} |  6 +++---
 ...name2.kt => TestComposable2group1name2.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 .../output/TestComposable1group1name1.kt}     |  6 +++---
 .../output/TestComposable2group1name2.kt}     |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...ase_processor_testing_my_very_long_name.kt |  6 ++++--
 ...roupname.kt => TestComposablegroupname.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...nd_skipprivate_option_compiles_ok_input.kt | 14 ++++++++------
 ...name1.kt => TestComposable1group1name1.kt} |  6 ++----
 ...name3.kt => TestComposable3group3name3.kt} |  6 ++----
 ...nd_skipprivate_option_compiles_ok_input.kt | 14 ++++++++------
 ...name1.kt => TestComposable1group1name1.kt} |  6 ++----
 ...name3.kt => TestComposable3group3name3.kt} |  6 ++----
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...apperClassRed.kt => redWrapperClassRed.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...lassTitle.kt => titleWrapperClassTitle.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...apperClassRed.kt => redWrapperClassRed.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...lassTitle.kt => titleWrapperClassTitle.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rtestinggroupname.kt => titlegroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...rtestinggroupname.kt => titlegroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rtestinggroupname.kt => titlegroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...rtestinggroupname.kt => titlegroupname.kt} |  2 +-
 .../output/ShowkaseMetadata_.kt               |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 .../output/{groupname.kt => redgroupname.kt}  |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...sortestinggroupname.kt => redgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 ...name.kt => TestComposablecomponentname.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...sortestingcolorname.kt => redcolorname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...sortestinggroupname.kt => redgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...sortestinggroupname.kt => redgroupname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...sortestinggroupname.kt => redgroupname.kt} |  2 +-
 .../output/ShowkaseMetadata_.kt               |  8 ++++----
 .../output/TestComposable1group1name1.kt}     |  4 ++--
 .../output/TestComposable2group2name2.kt}     |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 .../output/TestComposable1group1name1.kt      | 15 +++++++++++++++
 ...name2.kt => TestComposable2group2name2.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...roidshowkaseprocessortestinggroup1name1.kt | 15 ---------------
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt         | 15 +++++++++++++++
 ...ndroidshowkaseprocessortestinggroupname.kt | 15 ---------------
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt         | 15 +++++++++++++++
 ...ndroidshowkaseprocessortestinggroupname.kt | 15 ---------------
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 ...name.kt => TestComposablecomponentname.kt} |  5 ++---
 ...sortestingcolorname.kt => redcolorname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 ...name.kt => TestComposablecomponentname.kt} |  5 ++---
 ...pographyname.kt => titletypographyname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt | 10 ++++++----
 ...Composable2DefaultGroupTestComposable2.kt} |  5 ++---
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  5 +++--
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  5 +++--
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...t => testComposablegroupTestComposable.kt} |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  5 +++--
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  5 +++--
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 ...rbnb_android_showkase_processor_testing.kt | 10 ++++++----
 ...Composable2DefaultGroupTestComposable2.kt} |  5 ++---
 ...stComposableDefaultGroupTestComposable.kt} |  6 +++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...faultGroupRed.kt => redDefaultGroupRed.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupTitle.kt => titleDefaultGroupTitle.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 .../output/titlegroupname.kt}                 |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  8 ++++----
 ...name.kt => TestComposablecomponentname.kt} |  5 ++---
 .../output/TestShowkaseRootCodegen.kt         |  4 ++--
 ...pographyname.kt => titletypographyname.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/titlegroupname.kt}                 |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 .../output/titlegroupname.kt}                 |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 ...estinggroupTitle.kt => titlegroupTitle.kt} |  2 +-
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 .../output/TestComposablegroupname.kt}        |  5 ++---
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  4 ++--
 ...rbnb_android_showkase_processor_testing.kt |  4 ++--
 ...roupname.kt => TestComposablegroupname.kt} |  4 ++--
 .../output/TestShowkaseRootCodegen.kt         |  2 +-
 .../showkase/processor/ShowkaseProcessor.kt   | 18 ++++++++++--------
 .../processor/models/ShowkaseMetadata.kt      |  4 ++++
 .../writer/ShowkaseCodegenMetadataWriter.kt   |  6 ++++--
 .../showkase/processor/writer/WriterUtils.kt  |  8 ++++----
 256 files changed, 666 insertions(+), 642 deletions(-)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group1name1.kt => class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt} (68%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group2name2.kt => class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt} (68%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/{colorname.kt => redcolorname.kt} (84%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/{typographyname.kt => titletypographyname.kt} (83%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt => class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/{comairbnbandroidshowkaseprocessortestinggroup2name2.kt => TestComposable2group2name2.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/{comairbnbandroidshowkaseprocessortestingcolorname.kt => redcolorname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/{comairbnbandroidshowkaseprocessortestingtypographyname.kt => titletypographyname.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/{comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1.kt => TestComposable1WrapperClassTestComposable1.kt} (61%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt => class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable2DefaultGroupTestComposable2.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => colorgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassname.kt => colorWrapperClassname.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => colorgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => colorgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => redgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposableWithDefaultParametersgroupname.kt} (83%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/{comairbnbandroidshowkaseprocessortestinggroup2name2.kt => TestComposable1group2name2.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/{comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt => HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/{comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt => HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt} (81%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (73%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/{comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt => ComposablePreviewFontfontscaleslargefont1.kt} (70%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/{comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt => ComposablePreviewFontfontscalessmallfont.kt} (70%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/{comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent.kt => Componentcomponentgroupcomponent.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt => composable_function_with_multiple_preview_functions_compiles/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/{comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1.kt => ComponentfontscalesComponentlargefont1.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/{comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont.kt => ComponentfontscalesComponentsmallfont.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt => composable_function_with_multiple_preview_functions_compiles_ksp/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt => composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/{comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt => HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/{comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt => StackedShowkaseComposablesfontscaleslargefont1.kt} (71%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/{comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt => StackedShowkaseComposablesfontscalessmallfont.kt} (71%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt => composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/{comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt => HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/{comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider.kt => TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/{comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider.kt => TestComposable2Group1Composable2Usageofacharpreviewparameterprovider.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{function_inside_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{function_inside_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => function_inside_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt => function_inside_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt} (62%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt => multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt => multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestinggroup1name1.kt => TestComposable1group1name1.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestinggroup1name2.kt => TestComposable2group1name2.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt => multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt => multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/{comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname.kt => TestComposablegroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/{ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1.kt => TestComposable1group1name1.kt} (68%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/{ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3.kt => TestComposable3group3name3.kt} (68%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/{ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1.kt => TestComposable1group1name1.kt} (61%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/{ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3.kt => TestComposable3group3name3.kt} (61%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt => redWrapperClassRed.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt => titleWrapperClassTitle.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt => redWrapperClassRed.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt => titleWrapperClassTitle.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => titlegroupname.kt} (80%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => titlegroupname.kt} (80%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => titlegroupname.kt} (80%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => titlegroupname.kt} (80%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/{groupname.kt => redgroupname.kt} (84%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => redgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/{comairbnbandroidshowkaseprocessortestingcomponentname.kt => TestComposablecomponentname.kt} (67%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/{comairbnbandroidshowkaseprocessortestingcolorname.kt => redcolorname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => redgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => redgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => redgroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group1name1.kt => top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable1group1name1.kt} (68%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group2name2.kt => top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable2group2name2.kt} (68%)
 create mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable1group1name1.kt
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/{comairbnbandroidshowkaseprocessortestinggroup2name2.kt => TestComposable2group2name2.kt} (65%)
 delete mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (67%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_composable_function_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (85%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (85%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_composable_function_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (69%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (67%)
 create mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
 delete mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
 create mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
 delete mode 100644 showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestingcomponentname.kt => TestComposablecomponentname.kt} (67%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestingcolorname.kt => redcolorname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestingcomponentname.kt => TestComposablecomponentname.kt} (67%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestingtypographyname.kt => titletypographyname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt => TestComposable2DefaultGroupTestComposable2.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_preview_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/{comairbnbandroidshowkaseprocessortestinggroupTestComposable.kt => testComposablegroupTestComposable.kt} (66%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_showkase_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt => top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt => top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt} (65%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingDefaultGroupRed.kt => redDefaultGroupRed.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/{comairbnbandroidshowkaseprocessortestingDefaultGroupTitle.kt => titleDefaultGroupTitle.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/titlegroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/{comairbnbandroidshowkaseprocessortestingcomponentname.kt => TestComposablecomponentname.kt} (67%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/{comairbnbandroidshowkaseprocessortestingtypographyname.kt => titletypographyname.kt} (78%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/titlegroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/titlegroupname.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/{comairbnbandroidshowkaseprocessortestinggroupTitle.kt => titlegroupTitle.kt} (79%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/{composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt => wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt} (64%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (82%)
 rename showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/{comairbnbandroidshowkaseprocessortestinggroupname.kt => TestComposablegroupname.kt} (82%)

diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_.kt
index 3cc3009c..8fd67e63 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "group1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun TestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,11 +30,11 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "group2name2",
+    generatedPropertyName = "TestComposable2group2name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group2name2(): Unit {
+  public fun TestComposable2group2name2(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -46,10 +46,10 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "colorname",
+    generatedPropertyName = "redcolorname",
     showkaseMetadataType = "COLOR",
   )
-  public fun colorname(): Unit {
+  public fun redcolorname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -61,9 +61,9 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "typographyname",
+    generatedPropertyName = "titletypographyname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun typographyname(): Unit {
+  public fun titletypographyname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
index b8489cd7..de6c18bd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
@@ -2,11 +2,11 @@
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """_null_group1_name1_0_null""",
+        componentKey = """_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group2name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group2name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
index 6c7ed9bd..6c85a86d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/group2name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
@@ -2,11 +2,11 @@
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable2group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group2",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """_null_group2_name2_0_null""",
+        componentKey = """_TestComposable2_null_group2_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
index d27758ed..232fe312 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
@@ -16,22 +16,22 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        group1name1,
-        group2name2,
+        TestComposable1group1name1,
+        TestComposable2group2name2,
     )
   }
 
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        colorname,
+        redcolorname,
     )
   }
 
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        typographyname,
+        titletypographyname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/colorname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/redcolorname.kt
similarity index 84%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/colorname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/redcolorname.kt
index 3c68ec02..3c13537d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/colorname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/redcolorname.kt
@@ -1,7 +1,7 @@
 // This is an auto-generated file. Please do not edit/modify this file.
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val colorname: ShowkaseBrowserColor = 
+public val redcolorname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "color",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/typographyname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
similarity index 83%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/typographyname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
index a6f89ca0..f7f5e7d2 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/typographyname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
@@ -1,7 +1,7 @@
 // This is an auto-generated file. Please do not edit/modify this file.
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val typographyname: ShowkaseBrowserTypography = 
+public val titletypographyname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "typography",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index cfea226c..b47be83e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,11 +30,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup2name2",
+    generatedPropertyName = "TestComposable2group2name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group2name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2group2name2(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -46,10 +46,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcolorname",
+    generatedPropertyName = "redcolorname",
     showkaseMetadataType = "COLOR",
   )
-  public fun colorname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredcolorname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -61,9 +61,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingtypographyname",
+    generatedPropertyName = "titletypographyname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun typographyname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitletypographyname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
index d6e35e01..8405a477 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable1group1name1.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name1: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name1_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
index c627b40e..db50716b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestComposable2group2name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup2name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable2group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group2",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group2_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable2_null_group2_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
index 7c3afb2d..8a7cafbb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/TestShowkaseRootCodegen.kt
@@ -18,22 +18,22 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroup1name1,
-        comairbnbandroidshowkaseprocessortestinggroup2name2,
+        TestComposable1group1name1,
+        TestComposable2group2name2,
     )
   }
 
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestingcolorname,
+        redcolorname,
     )
   }
 
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestingtypographyname,
+        titletypographyname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingcolorname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/redcolorname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/redcolorname.kt
index 15648726..c40da4bb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/redcolorname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingcolorname: ShowkaseBrowserColor = 
+public val redcolorname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "color",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
index 1e7de676..4c1a56a3 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/titletypographyname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingtypographyname: ShowkaseBrowserTypography = 
+public val titletypographyname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "typography",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 9f8c4b80..bca812fd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -16,12 +16,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1",
+    generatedPropertyName = "TestComposable1WrapperClassTestComposable1",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable1(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1WrapperClassTestComposable1():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -33,12 +35,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2",
+    generatedPropertyName = "TestComposable2DefaultGroupTestComposable2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun DefaultGroupTestComposable2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2DefaultGroupTestComposable2():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable1WrapperClassTestComposable1.kt
similarity index 61%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable1WrapperClassTestComposable1.kt
index 9b768cce..72b3436b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable1WrapperClassTestComposable1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable1WrapperClassTestComposable1: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable1",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable1_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable1_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable1_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass().TestComposable1()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable2DefaultGroupTestComposable2.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable2DefaultGroupTestComposable2.kt
index 63e1830b..75feb244 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestComposable2DefaultGroupTestComposable2.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
-    List<ShowkaseBrowserComponent> = 
+public val TestComposable2DefaultGroupTestComposable2: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -17,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
                     componentName = "TestComposable2",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable2_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposable2_null_DefaultGroup_TestComposable2_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable2(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestShowkaseRootCodegen.kt
index 846bd4a4..b71d8843 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/TestShowkaseRootCodegen.kt
@@ -18,9 +18,9 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return mutableListOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable1,
+        TestComposable1WrapperClassTestComposable1,
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2)
+        addAll(TestComposable2DefaultGroupTestComposable2)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 61965861..aab870ea 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "colorgroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasscolorgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index a00cb6a0..111da11e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -24,7 +24,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        colorgroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
index 42043cde..8616be61 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val colorgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 5e15e89b..ad8757a3 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassname",
+    generatedPropertyName = "colorWrapperClassname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun WrapperClassname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasscolorWrapperClassname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/TestShowkaseRootCodegen.kt
index d39f1bf0..3fb8c351 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/TestShowkaseRootCodegen.kt
@@ -24,7 +24,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestingWrapperClassname,
+        colorWrapperClassname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/colorWrapperClassname.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/colorWrapperClassname.kt
index 0dea06a7..b970245b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_class_with_showkasecolor_annotation_and_showkaseroot_with_no_group/output/colorWrapperClassname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassname: ShowkaseBrowserColor = 
+public val colorWrapperClassname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "WrapperClass",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a0d0d2b9..4c64c080 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "colorgroupname",
     enclosingClass = [ShowkaseObject::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseObjectcolorgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/colorgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/colorgroupname.kt
index 9737a6bb..e0669bad 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_ShowkaseColor_annotation_compiles_ok/output/colorgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val colorgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c1eabc57..723a55fc 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "colorgroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasscolorgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index a00cb6a0..111da11e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -24,7 +24,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        colorgroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
index d68fefb2..a72a0085 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_property_inside_object_with_showkasecolor_annotation_and_showkaseroot_generates_1_file/output/colorgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val colorgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index e4ec1ff3..b1481d3d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "redgroupname",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablesredgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/redgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/redgroupname.kt
index 918b9825..a4c7c583 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/color_with_showkase_color_annotation_inside_class_compiles_ok/output/redgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a0a98466..0a0af554 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
index 3e7900fc..0a3c2f17 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass().TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 0f342a8f..a7ea7606 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [ShowkaseClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
index e7931d59..b8cfde3b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.ShowkaseClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.ShowkaseClass_TestComposable_com.airbnb.android.showkase_processor_testing.ShowkaseClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             ShowkaseClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 059280a8..5d92a6c0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 92166c10..ad41d23b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 059280a8..5d92a6c0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
index 92166c10..ad41d23b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 0f342a8f..a7ea7606 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [ShowkaseClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
index e7931d59..b8cfde3b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.ShowkaseClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.ShowkaseClass_TestComposable_com.airbnb.android.showkase_processor_testing.ShowkaseClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             ShowkaseClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 059280a8..5d92a6c0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 92166c10..ad41d23b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a1394330..c111144f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [ShowkaseObject::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseObjectTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
index eed65595..49045c06 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.ShowkaseObject_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.ShowkaseObject_TestComposable_com.airbnb.android.showkase_processor_testing.ShowkaseObject_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             ShowkaseObject.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 0784150f..fd988b2f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperObject::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperObjectTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 5681e3e8..3ce8759a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperObject_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperObject_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperObject_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperObject.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 059280a8..5d92a6c0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
index 92166c10..ad41d23b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_companion_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a1394330..c111144f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [ShowkaseObject::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseObjectTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
index eed65595..49045c06 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.ShowkaseObject_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.ShowkaseObject_TestComposable_com.airbnb.android.showkase_processor_testing.ShowkaseObject_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             ShowkaseObject.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 0784150f..fd988b2f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperObject::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperObjectTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 5681e3e8..3ce8759a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_object_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperObject_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperObject_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperObject_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperObject.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 79ee82a5..39cdbe92 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,12 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposableWithDefaultParametersgroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [NewParameterProvider::class],
     previewParameterName = "bankHeader",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposableWithDefaultParametersgroupname():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestComposableWithDefaultParametersgroupname.kt
similarity index 83%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestComposableWithDefaultParametersgroupname.kt
index 8a75a9ee..dca195dd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestComposableWithDefaultParametersgroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposableWithDefaultParametersgroupname: List<ShowkaseBrowserComponent> = 
     NewParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposableWithDefaultParameters_null_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposableWithDefaultParameters(bankHeader =
                         previewParam) }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestShowkaseRootCodegen.kt
index 93febe07..abe972b6 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_that_has_default_parameters_compiles_ok/output/TestShowkaseRootCodegen.kt
@@ -19,7 +19,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
 
     return mutableListOf<ShowkaseBrowserComponent>(
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestinggroupname)
+        addAll(TestComposableWithDefaultParametersgroupname)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 152b6080..e63c524a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup2name2",
+    generatedPropertyName = "TestComposable1group2name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group2name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group2name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/TestComposable1group2name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/TestComposable1group2name2.kt
index a09d4cfc..6f1e67e9 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_both_annotations_gives_priority_to_showkase_annotation/output/TestComposable1group2name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup2name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable1group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group2",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group2_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group2_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
index de41746e..c8872a44 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewlighttheme: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - light theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-lighttheme_0_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-lighttheme_0_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 1d18a301..6cd9dd1e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewlighttheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewlighttheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewlighttheme():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
similarity index 81%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
index 1e622a9a..2ca4f255 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme:
-    List<ShowkaseBrowserComponent> = 
+public val HelloWorldPreviewthemesHelloWorldPreviewlighttheme: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -17,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlightt
                     componentName = "HelloWorldPreview - light theme",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-lighttheme_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-lighttheme_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { HelloWorldPreview(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index b23ae179..050c8397 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_custom_preview_annotation_with_preview_param_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,13 +15,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewlighttheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun themesHelloWorldPreviewlighttheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewlighttheme():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 7964e226..58aa8fe1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -16,11 +16,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideWrapperClass = false,
     showkaseKDoc =
         "This component shows some static text in cursive text style.\n\n Example usage:\n\n ```\n @Composable\n fun MyComposable() { CursiveTextComponentPreview() }\n ```",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestComposablegroupname.kt
similarity index 73%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestComposablegroupname.kt
index 3d03b8f7..6c5c605d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestComposablegroupname.kt
@@ -4,8 +4,7 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = """
@@ -19,7 +18,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserCom
         | ```
         """.trimMargin(),
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_kdoc_inside_object_with_showkase_annotation_and_showkaseroot_generates_2_files/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscaleslargefont1.kt
similarity index 70%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscaleslargefont1.kt
index 14cf93af..740a2385 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscaleslargefont1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscaleslargefont1: ShowkaseBrowserComponent =
+public val ComposablePreviewFontfontscaleslargefont1: ShowkaseBrowserComponent =
     ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "large font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_fontscales_largefont_1_null""",
+            """com.airbnb.android.showkase_processor_testing_ComposablePreviewFont_null_fontscales_largefont_1_null""",
         isDefaultStyle = false,
         component = @Composable { ComposablePreviewFont() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscalessmallfont.kt
similarity index 70%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscalessmallfont.kt
index 3dc71c9b..f2a74de6 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ComposablePreviewFontfontscalessmallfont.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscalessmallfont: ShowkaseBrowserComponent =
+public val ComposablePreviewFontfontscalessmallfont: ShowkaseBrowserComponent =
     ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "small font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_fontscales_smallfont_0_null""",
+            """com.airbnb.android.showkase_processor_testing_ComposablePreviewFont_null_fontscales_smallfont_0_null""",
         isDefaultStyle = false,
         component = @Composable { ComposablePreviewFont() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c33509be..fe606def 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscalessmallfont",
+    generatedPropertyName = "ComposablePreviewFontfontscalessmallfont",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun fontscalessmallfont(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablePreviewFontfontscalessmallfont():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +31,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscaleslargefont1",
+    generatedPropertyName = "ComposablePreviewFontfontscaleslargefont1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun fontscaleslargefont1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablePreviewFontfontscaleslargefont1():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/Componentcomponentgroupcomponent.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/Componentcomponentgroupcomponent.kt
index 0e1ef59f..b3331014 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/Componentcomponentgroupcomponent.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent: ShowkaseBrowserComponent
-    = ShowkaseBrowserComponent(
+public val Componentcomponentgroupcomponent: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "component-group",
         componentName = "component",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.Composables_component-group_component_0_null""",
+            """com.airbnb.android.showkase_processor_testing.Composables_Component_com.airbnb.android.showkase_processor_testing.Composables_component-group_component_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().Component()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
index 59cb3df6..be7b2623 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewdarktheme: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - dark theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-darktheme_0_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-darktheme_0_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index fb3852b0..ec955940 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,12 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcomponentgroupcomponent",
+    generatedPropertyName = "Componentcomponentgroupcomponent",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun componentgroupcomponent(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablesComponentcomponentgroupcomponent():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -32,11 +33,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewdarktheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewdarktheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewdarktheme():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentlargefont1.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentlargefont1.kt
index f3b5c454..818160b2 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentlargefont1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val ComponentfontscalesComponentlargefont1: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "Component - large font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.Composables_fontscales_Component-largefont_1_null""",
+            """com.airbnb.android.showkase_processor_testing.Composables_Component_com.airbnb.android.showkase_processor_testing.Composables_fontscales_Component-largefont_1_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().Component()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentsmallfont.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentsmallfont.kt
index 31a8f3a2..4ea64b45 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ComponentfontscalesComponentsmallfont.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val ComponentfontscalesComponentsmallfont: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "Component - small font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.Composables_fontscales_Component-smallfont_0_null""",
+            """com.airbnb.android.showkase_processor_testing.Composables_Component_com.airbnb.android.showkase_processor_testing.Composables_fontscales_Component-smallfont_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().Component()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
index 59cb3df6..be7b2623 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewdarktheme: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - dark theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-darktheme_0_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-darktheme_0_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 388bb371..471d6106 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,12 +15,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscalesComponentsmallfont",
+    generatedPropertyName = "ComponentfontscalesComponentsmallfont",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun fontscalesComponentsmallfont(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingComposablesComponentfontscalesComponentsmallfont():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -32,12 +34,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscalesComponentlargefont1",
+    generatedPropertyName = "ComponentfontscalesComponentlargefont1",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun fontscalesComponentlargefont1(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingComposablesComponentfontscalesComponentlargefont1():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -49,11 +53,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewdarktheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewdarktheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewdarktheme():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
index 59cb3df6..be7b2623 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_preview_functions_compiles_ksp/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewdarktheme: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - dark theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-darktheme_0_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-darktheme_0_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
index 83c78c85..fbf3f161 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewlighttheme1: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - light theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-lighttheme_1_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-lighttheme_1_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 2c7e0bff..6691fd3f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,12 +14,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewdarktheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewdarktheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewdarktheme():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,11 +32,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewlighttheme1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewlighttheme1(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewlighttheme1():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4bcce4c8..3411c992 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,13 +14,15 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscalessmallfont",
+    generatedPropertyName = "StackedShowkaseComposablesfontscalessmallfont",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     showkaseWidthDp = 250,
     showkaseHeightDp = 250,
   )
-  public fun fontscalessmallfont(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingStackedShowkaseComposablesfontscalessmallfont():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -32,12 +34,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingfontscaleslargefont1",
+    generatedPropertyName = "StackedShowkaseComposablesfontscaleslargefont1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     showkaseWidthDp = 200,
     showkaseHeightDp = 200,
   )
-  public fun fontscaleslargefont1(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingStackedShowkaseComposablesfontscaleslargefont1():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscaleslargefont1.kt
similarity index 71%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscaleslargefont1.kt
index acc985d4..9afa1660 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscaleslargefont1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscaleslargefont1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscaleslargefont1: ShowkaseBrowserComponent =
+public val StackedShowkaseComposablesfontscaleslargefont1: ShowkaseBrowserComponent =
     ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "large font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_fontscales_largefont_1_null""",
+            """com.airbnb.android.showkase_processor_testing_StackedShowkaseComposables_null_fontscales_largefont_1_null""",
         isDefaultStyle = false,
         widthDp = 200,
         heightDp = 200,
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscalessmallfont.kt
similarity index 71%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscalessmallfont.kt
index f5ae6654..28099935 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/comairbnbandroidshowkaseprocessortestingfontscalessmallfont.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_showkasecomposable_annotations_stacked_generates_output/output/StackedShowkaseComposablesfontscalessmallfont.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingfontscalessmallfont: ShowkaseBrowserComponent =
+public val StackedShowkaseComposablesfontscalessmallfont: ShowkaseBrowserComponent =
     ShowkaseBrowserComponent(
         group = "font scales",
         componentName = "small font",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_fontscales_smallfont_0_null""",
+            """com.airbnb.android.showkase_processor_testing_StackedShowkaseComposables_null_fontscales_smallfont_0_null""",
         isDefaultStyle = false,
         widthDp = 250,
         heightDp = 250,
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
index 59cb3df6..be7b2623 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_multiple_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewdarktheme.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewdarktheme: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - dark theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-darktheme_0_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-darktheme_0_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
index 83c78c85..fbf3f161 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/HelloWorldPreviewthemesHelloWorldPreviewlighttheme1.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val HelloWorldPreviewthemesHelloWorldPreviewlighttheme1: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "themes",
         componentName = "HelloWorldPreview - light theme",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_themes_HelloWorldPreview-lighttheme_1_null""",
+            """com.airbnb.android.showkase_processor_testing_HelloWorldPreview_null_themes_HelloWorldPreview-lighttheme_1_null""",
         isDefaultStyle = false,
         component = @Composable { HelloWorldPreview() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 2c7e0bff..6691fd3f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_with_repeatable_custom_preview_annotation_generates_output/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,12 +14,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewdarktheme",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewdarktheme",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewdarktheme(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewdarktheme():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,11 +32,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkaseprocessortestingthemesHelloWorldPreviewlighttheme1",
+    generatedPropertyName = "HelloWorldPreviewthemesHelloWorldPreviewlighttheme1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun themesHelloWorldPreviewlighttheme1(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingHelloWorldPreviewthemesHelloWorldPreviewlighttheme1():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/ShowkaseMetadata_com_airbnb_android_showkase_browser_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/ShowkaseMetadata_com_airbnb_android_showkase_browser_testing.kt
index fbac13aa..4dec4c7a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/ShowkaseMetadata_com_airbnb_android_showkase_browser_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/ShowkaseMetadata_com_airbnb_android_showkase_browser_testing.kt
@@ -17,13 +17,15 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_browser_testing {
     insideWrapperClass = false,
     showkaseKDoc = "",
     generatedPropertyName =
-        "comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider",
+        "TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [IntegerParameterProvider::class],
     previewParameterName = "n",
   )
-  public fun Group1Composable1Usageofanintegerpreviewparameterprovider(): Unit {
+  public
+      fun comairbnbandroidshowkasebrowsertestingTestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -35,13 +37,14 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_browser_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider",
+    generatedPropertyName = "TestComposable2Group1Composable2Usageofacharpreviewparameterprovider",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [CharParameterProvider::class],
     previewParameterName = "c",
   )
-  public fun Group1Composable2Usageofacharpreviewparameterprovider(): Unit {
+  public
+      fun comairbnbandroidshowkasebrowsertestingTestComposable2Group1Composable2Usageofacharpreviewparameterprovider():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider.kt
index 93b4d886..b6c8ccd9 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public
-    val comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider:
+public val TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider:
     List<ShowkaseBrowserComponent> = 
     IntegerParameterProvider()
         .values
@@ -18,7 +17,7 @@ public
                     componentName = "Composable1 Usage of an integer preview parameter provider",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_browser_testing_null_Group1_Composable1Usageofanintegerpreviewparameterprovider_0_null_$index""",
+                        """com.airbnb.android.showkase_browser_testing_TestComposable1_null_Group1_Composable1Usageofanintegerpreviewparameterprovider_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable1(n = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable2Group1Composable2Usageofacharpreviewparameterprovider.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable2Group1Composable2Usageofacharpreviewparameterprovider.kt
index f9fc58ef..eb7b06e9 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestComposable2Group1Composable2Usageofacharpreviewparameterprovider.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public
-    val comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider:
+public val TestComposable2Group1Composable2Usageofacharpreviewparameterprovider:
     List<ShowkaseBrowserComponent> = 
     CharParameterProvider()
         .values
@@ -18,7 +17,7 @@ public
                     componentName = "Composable2 Usage of a char preview parameter provider",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_browser_testing_null_Group1_Composable2Usageofacharpreviewparameterprovider_0_null_$index""",
+                        """com.airbnb.android.showkase_browser_testing_TestComposable2_null_Group1_Composable2Usageofacharpreviewparameterprovider_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable2(c = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestShowkaseRootCodegen.kt
index 6d8567e3..6683d9ff 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_previews_with_multiple_parameter_providers_should_indent_properly/output/TestShowkaseRootCodegen.kt
@@ -6,8 +6,8 @@ import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 import com.airbnb.android.showkase.models.ShowkaseProvider
-import com.airbnb.android.showkase_browser_testing.comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider
-import com.airbnb.android.showkase_browser_testing.comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider
+import com.airbnb.android.showkase_browser_testing.TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider
+import com.airbnb.android.showkase_browser_testing.TestComposable2Group1Composable2Usageofacharpreviewparameterprovider
 import kotlin.collections.List
 
 @ShowkaseRootCodegen(
@@ -21,8 +21,8 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
 
     return mutableListOf<ShowkaseBrowserComponent>(
     ).apply {
-        addAll(comairbnbandroidshowkasebrowsertestingGroup1Composable1Usageofanintegerpreviewparameterprovider)
-        addAll(comairbnbandroidshowkasebrowsertestingGroup1Composable2Usageofacharpreviewparameterprovider)
+        addAll(TestComposable1Group1Composable1Usageofanintegerpreviewparameterprovider)
+        addAll(TestComposable2Group1Composable2Usageofacharpreviewparameterprovider)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 9320e13d..68d265dd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablesTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
index e3c2b64c..dfc40417 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_preview_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.Composables_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.Composables_TestComposable_com.airbnb.android.showkase_processor_testing.Composables_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 9320e13d..68d265dd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablesTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
index e3c2b64c..dfc40417 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_with_showkase_annotation_inside_class_compiles_ok/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.Composables_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.Composables_TestComposable_com.airbnb.android.showkase_processor_testing.Composables_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 8e483658..af65f01a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 5ce7c160..11d5bd56 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass().testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 8e483658..af65f01a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 5ce7c160..11d5bd56 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_class_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass().testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 61ac1bdc..cdd88ce7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 750a4f92..f7e4700d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 61ac1bdc..cdd88ce7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 750a4f92..f7e4700d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 61ac1bdc..cdd88ce7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 750a4f92..f7e4700d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_preview_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 61ac1bdc..cdd88ce7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable",
+    generatedPropertyName = "testComposableWrapperClassTestComposable",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun WrapperClassTestComposable(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingWrapperClasstestComposableWrapperClassTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
similarity index 62%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
index 750a4f92..f7e4700d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_companion_object_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/function_inside_object_with_showkase_annotation_and_no_name_or_group/output/testComposableWrapperClassTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableWrapperClassTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "WrapperClass",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_testComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_WrapperClass_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass.testComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 5422840f..1b2a7e20 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +30,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name2",
+    generatedPropertyName = "TestComposable2group1name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2group1name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
index d6e35e01..8405a477 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name1: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name1_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
index 2a97b864..4f84beee 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable2group1name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable2_null_group1_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 5422840f..1b2a7e20 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +30,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name2",
+    generatedPropertyName = "TestComposable2group1name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2group1name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
index d6e35e01..8405a477 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name1: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name1_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
index 2a97b864..4f84beee 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable2group1name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable2_null_group1_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 5422840f..1b2a7e20 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +30,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name2",
+    generatedPropertyName = "TestComposable2group1name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2group1name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
index d6e35e01..8405a477 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable1group1name1.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name1: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name1_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
index 2a97b864..4f84beee 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_preview_and_showkase_annotations_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroup1name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/multiple_composable_functions_with_showkase_annotations_generates_only_metadata_file/output/TestComposable2group1name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup1name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable2group1name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable2_null_group1_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index f30f1376..61596af4 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -16,13 +16,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestComposablegroupname.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestComposablegroupname.kt
index 3aec7b04..00ea2f05 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestComposablegroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable {
                         WrapperClass.TestComposable(text = previewParam)
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestShowkaseRootCodegen.kt
index 93febe07..d7322dd1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot/output/TestShowkaseRootCodegen.kt
@@ -19,7 +19,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
 
     return mutableListOf<ShowkaseBrowserComponent>(
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestinggroupname)
+        addAll(TestComposablegroupname)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_very_long_name.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_very_long_name.kt
index 2cfeee53..ca7db4e2 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_very_long_name.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_very_long_name.kt
@@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_v
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
@@ -24,6 +24,8 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing_my_v
         [MyVeryLongPackageNameViewStateSomethingSomethingFunnyStuffProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public
+      fun comairbnbandroidshowkaseprocessortestingmyverylongnameWrapperClassTestComposablegroupname():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestComposablegroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestComposablegroupname.kt
index 9de2a418..83c67eec 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestComposablegroupname.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname:
-    List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     MyVeryLongPackageNameViewStateSomethingSomethingFunnyStuffProvider()
         .values
         .iterator()
@@ -17,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname:
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_my_very_long_name_com.airbnb.android.showkase_processor_testing_my_very_long_name.WrapperClass_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_my_very_long_name.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing_my_very_long_name.WrapperClass_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable {
                         WrapperClass.TestComposable(text = previewParam)
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestShowkaseRootCodegen.kt
index b9734876..c1f427b0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/object_function_with_preview_annotation_and_preview_parameter_and_showkaseroot_and_long_parameter_provider_name/output/TestShowkaseRootCodegen.kt
@@ -19,7 +19,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
 
     return mutableListOf<ShowkaseBrowserComponent>(
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestingmyverylongnamegroupname)
+        addAll(TestComposablegroupname)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_preview_annotation_and_skipprivate_option_compiles_ok_input.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_preview_annotation_and_skipprivate_option_compiles_ok_input.kt
index a1f64ae6..deaadcf7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_preview_annotation_and_skipprivate_option_compiles_ok_input.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_preview_annotation_and_skipprivate_option_compiles_ok_input.kt
@@ -17,12 +17,13 @@ public class
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public
+      fun ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputTestComposable1group1name1():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -35,11 +36,12 @@ public class
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3",
+    generatedPropertyName = "TestComposable3group3name3",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group3name3(): Unit {
+  public
+      fun ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputTestComposable3group3name3():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
index 394b6454..c70abbe8 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
@@ -4,14 +4,12 @@ package ShowkaseProcessorTest.private_composable_with_preview_annotation_and_ski
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public
-    val ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup1name1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
         componentKey =
-            """ShowkaseProcessorTest.private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok.input_null_group1_name1_0_null""",
+            """ShowkaseProcessorTest.private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok.input_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
index f1a77eb8..72e3825d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
@@ -4,14 +4,12 @@ package ShowkaseProcessorTest.private_composable_with_preview_annotation_and_ski
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public
-    val ShowkaseProcessorTestprivatecomposablewithpreviewannotationandskipPrivateoptioncompilesokinputgroup3name3:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable3group3name3: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group3",
         componentName = "name3",
         componentKDoc = "",
         componentKey =
-            """ShowkaseProcessorTest.private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok.input_null_group3_name3_0_null""",
+            """ShowkaseProcessorTest.private_composable_with_preview_annotation_and_skipPrivate_option_compiles_ok.input_TestComposable3_null_group3_name3_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable3() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_showkase_annotation_and_skipprivate_option_compiles_ok_input.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_showkase_annotation_and_skipprivate_option_compiles_ok_input.kt
index af1b7bb1..a6eaceac 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_showkase_annotation_and_skipprivate_option_compiles_ok_input.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseMetadata_showkaseprocessortest_private_composable_with_showkase_annotation_and_skipprivate_option_compiles_ok_input.kt
@@ -18,13 +18,14 @@ public class
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public
+      fun ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputComposablesTestComposable1group1name1():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -37,12 +38,13 @@ public class
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName =
-        "ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3",
+    generatedPropertyName = "TestComposable3group3name3",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group3name3(): Unit {
+  public
+      fun ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputComposablesTestComposable3group3name3():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
similarity index 61%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
index f46acc91..52485f75 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable1group1name1.kt
@@ -4,14 +4,12 @@ package ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_sk
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public
-    val ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup1name1:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
         componentKey =
-            """ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input_ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_group1_name1_0_null""",
+            """ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_TestComposable1_ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().TestComposable1()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
similarity index 61%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
index 9272d621..065dd769 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok/output/TestComposable3group3name3.kt
@@ -4,14 +4,12 @@ package ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_sk
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public
-    val ShowkaseProcessorTestprivatecomposablewithshowkaseannotationandskipPrivateoptioncompilesokinputgroup3name3:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable3group3name3: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group3",
         componentName = "name3",
         componentKDoc = "",
         componentKey =
-            """ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input_ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_group3_name3_0_null""",
+            """ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_TestComposable3_ShowkaseProcessorTest.private_composable_with_showkase_annotation_and_skipPrivate_option_compiles_ok.input.Composables_group3_name3_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             Composables().TestComposable3()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c481c5fd..2f037c91 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassRed",
+    generatedPropertyName = "redWrapperClassRed",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun WrapperClassRed(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassredWrapperClassRed(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
index 67eeff67..4d52e205 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassRed: ShowkaseBrowserColor = 
+public val redWrapperClassRed: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "WrapperClass",
         colorName = "Red",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4a864ace..d8bac774 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTitle",
+    generatedPropertyName = "titleWrapperClassTitle",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun WrapperClassTitle(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasstitleWrapperClassTitle(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
index 50ed41f3..21506dbe 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_class_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTitle: ShowkaseBrowserTypography = 
+public val titleWrapperClassTitle: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "WrapperClass",
         typographyName = "Title",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index b9aee303..007560c4 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassRed",
+    generatedPropertyName = "redWrapperClassRed",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun WrapperClassRed(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassredWrapperClassRed(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
index bce6faad..896f85c3 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassRed.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_color_annotation_and_no_name_or_group/output/redWrapperClassRed.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassRed: ShowkaseBrowserColor = 
+public val redWrapperClassRed: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "WrapperClass",
         colorName = "Red",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index d98dec11..3c6c33e9 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingWrapperClassTitle",
+    generatedPropertyName = "titleWrapperClassTitle",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun WrapperClassTitle(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasstitleWrapperClassTitle(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
index 81528cf9..7568fcdb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingWrapperClassTitle.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/property_inside_object_with_showkase_typography_annotation_and_no_name_or_group/output/titleWrapperClassTitle.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingWrapperClassTitle: ShowkaseBrowserTypography = 
+public val titleWrapperClassTitle: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "WrapperClass",
         typographyName = "Title",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a7933b99..5b221de2 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasstitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index c437f5ad..a5aa2011 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -30,7 +30,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        titlegroupname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
similarity index 80%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
index 27dd3b76..903ca721 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_class_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 843c0a32..ff974d4d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     enclosingClass = [ShowkaseObject::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingShowkaseObjecttitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/titlegroupname.kt
similarity index 80%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/titlegroupname.kt
index 9be0a039..28a7d9ef 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_ShowkaseTypography_annotation_compiles_ok/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index dd412d7b..955854db 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = true,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasstitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index c437f5ad..a5aa2011 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -30,7 +30,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        titlegroupname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
similarity index 80%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
index b11b8119..34c64583 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_property_inside_object_with_showkasetypography_annotation_and_showkaseroot_generates_1_file/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 73b43d8c..550f239e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,10 +15,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     enclosingClass = [Composables::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingComposablestitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/titlegroupname.kt
similarity index 80%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/titlegroupname.kt
index 1dd8f0b3..2e2f186a 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/textstyle_with_ShowkaseTypography_annotation_inside_class_compiles_ok/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
index 4aea532e..250b19a9 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "groupname",
+    generatedPropertyName = "redgroupname",
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun redgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
index 9200a3d2..a44145c0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
@@ -22,7 +22,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        groupname,
+        redgroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/groupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/redgroupname.kt
similarity index 84%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/groupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/redgroupname.kt
index 4ced401f..9e1a3438 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/groupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_composable/output/redgroupname.kt
@@ -1,7 +1,7 @@
 // This is an auto-generated file. Please do not edit/modify this file.
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val groupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 7b62ccb2..88b5400f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "redgroupname",
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
index a00cb6a0..e1028e5d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
@@ -24,7 +24,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        redgroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/redgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/redgroupname.kt
index 5ef33a42..a2c9b4b1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/redgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index ab0cc239..9577475b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcomponentname",
+    generatedPropertyName = "TestComposablecomponentname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun componentname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablecomponentname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,9 +30,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcolorname",
+    generatedPropertyName = "redcolorname",
     showkaseMetadataType = "COLOR",
   )
-  public fun colorname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredcolorname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
index 9a05bbf0..5ffef5af 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingcomponentname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablecomponentname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "component",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_component_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_component_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
index c86281dc..06d92994 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,14 +18,14 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingcomponentname,
+        TestComposablecomponentname,
     )
   }
 
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestingcolorname,
+        redcolorname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/redcolorname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/redcolorname.kt
index 15648726..c40da4bb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_and_composable_function_generates_1_file/output/redcolorname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingcolorname: ShowkaseBrowserColor = 
+public val redcolorname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "color",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 7b62ccb2..88b5400f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "redgroupname",
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/redgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/redgroupname.kt
index 5ef33a42..a2c9b4b1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_compiles_ok/output/redgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 7b62ccb2..88b5400f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "redgroupname",
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redgroupname.kt
index 5ef33a42..a2c9b4b1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 7b62ccb2..88b5400f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "redgroupname",
     showkaseMetadataType = "COLOR",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredgroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index a00cb6a0..e1028e5d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -24,7 +24,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseColors(): List<ShowkaseBrowserColor> {
 
     return listOf<ShowkaseBrowserColor>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        redgroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/redgroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/redgroupname.kt
index 5ef33a42..a2c9b4b1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_color_property_with_showkasecolor_and_showkaseroot_generates_1_file/output/redgroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserColor = 
+public val redgroupname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "group",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
index 2da555e1..fca226a8 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/ShowkaseMetadata_.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "group1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun TestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +30,10 @@ public class ShowkaseMetadata_ {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "group2name2",
+    generatedPropertyName = "TestComposable2group2name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group2name2(): Unit {
+  public fun TestComposable2group2name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable1group1name1.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group1name1.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable1group1name1.kt
index b8489cd7..de6c18bd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group1name1.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable1group1name1.kt
@@ -2,11 +2,11 @@
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group1",
         componentName = "name1",
         componentKDoc = "",
-        componentKey = """_null_group1_name1_0_null""",
+        componentKey = """_TestComposable1_null_group1_name1_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable1() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group2name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable2group2name2.kt
similarity index 68%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group2name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable2group2name2.kt
index 6c7ed9bd..6c85a86d 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_paparazzi_screenshot_test_for_all_UI_elements/output/group2name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestComposable2group2name2.kt
@@ -2,11 +2,11 @@
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposable2group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group2",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """_null_group2_name2_0_null""",
+        componentKey = """_TestComposable2_null_group2_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
index d4aa90fd..14b09faf 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_Paparazzi_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
@@ -16,8 +16,8 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        group1name1,
-        group2name2,
+        TestComposable1group1name1,
+        TestComposable2group2name2,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c46c4610..72793e25 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup1name1",
+    generatedPropertyName = "TestComposable1group1name1",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group1name1(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable1group1name1(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,10 +30,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroup2name2",
+    generatedPropertyName = "TestComposable2group2name2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun group2name2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2group2name2(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable1group1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable1group1name1.kt
new file mode 100644
index 00000000..8405a477
--- /dev/null
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable1group1name1.kt
@@ -0,0 +1,15 @@
+// This is an auto-generated file. Please do not edit/modify this file.
+package com.airbnb.android.showkase_processor_testing
+
+import androidx.compose.runtime.Composable
+import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
+
+public val TestComposable1group1name1: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+        group = "group1",
+        componentName = "name1",
+        componentKDoc = "",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable1_null_group1_name1_0_null""",
+        isDefaultStyle = false,
+        component = @Composable { TestComposable1() }
+    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable2group2name2.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable2group2name2.kt
index c627b40e..db50716b 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup2name2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestComposable2group2name2.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroup2name2: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposable2group2name2: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group2",
         componentName = "name2",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group2_name2_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable2_null_group2_name2_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable2() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
index bbd06c90..6e3fa2b2 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
@@ -18,8 +18,8 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroup1name1,
-        comairbnbandroidshowkaseprocessortestinggroup2name2,
+        TestComposable1group1name1,
+        TestComposable2group2name2,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
deleted file mode 100644
index d6e35e01..00000000
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroup1name1.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is an auto-generated file. Please do not edit/modify this file.
-package com.airbnb.android.showkase_processor_testing
-
-import androidx.compose.runtime.Composable
-import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
-
-public val comairbnbandroidshowkaseprocessortestinggroup1name1: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
-        group = "group1",
-        componentName = "name1",
-        componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group1_name1_0_null""",
-        isDefaultStyle = false,
-        component = @Composable { TestComposable1() }
-    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
index 95192d33..2f325cb5 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 537a9922..9031b098 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,12 +14,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     showkaseWidthDp = 150,
     showkaseHeightDp = 250,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
index a077a402..3e90875e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         widthDp = 150,
         heightDp = 250,
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
index 95192d33..2f325cb5 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 95192d33..2f325cb5 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 3759db2d..10b2a527 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,12 +15,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 85%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 89d68080..a19dc003 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 3759db2d..10b2a527 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,12 +15,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 85%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 89d68080..a19dc003 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_preview_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_parameter_and_showkase_composable_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
index 95192d33..2f325cb5 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_preview_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c2e308d2..b8d86445 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,12 +14,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     tags = ["tag A", "tag B"],
     extraMetadata = ["meta A"],
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestComposablegroupname.kt
similarity index 69%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestComposablegroupname.kt
index 86bab570..4a547292 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         tags = listOf("tag A", "tag B"),
         extraMetadata = listOf("meta A"),
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_tags_and_metadata/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a1899ff7..b0b35433 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,12 +14,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     showkaseWidthDp = 200,
     showkaseHeightDp = 300,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
index 9358cf2f..512db2c5 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestComposablegroupname.kt
@@ -4,12 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
         isDefaultStyle = false,
         widthDp = 200,
         heightDp = 300,
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
index ce009e4b..85bc8c08 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_and_showkaseroot_with_width_and_height/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        TestComposablegroupname,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
new file mode 100644
index 00000000..2f325cb5
--- /dev/null
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/TestComposablegroupname.kt
@@ -0,0 +1,15 @@
+// This is an auto-generated file. Please do not edit/modify this file.
+package com.airbnb.android.showkase_processor_testing
+
+import androidx.compose.runtime.Composable
+import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
+
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+        group = "group",
+        componentName = "name",
+        componentKDoc = "",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
+        isDefaultStyle = false,
+        component = @Composable { TestComposable() }
+    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
deleted file mode 100644
index 95192d33..00000000
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_compiles_ok/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is an auto-generated file. Please do not edit/modify this file.
-package com.airbnb.android.showkase_processor_testing
-
-import androidx.compose.runtime.Composable
-import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
-
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
-        group = "group",
-        componentName = "name",
-        componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
-        isDefaultStyle = false,
-        component = @Composable { TestComposable() }
-    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 4890072b..69b8f109 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
new file mode 100644
index 00000000..2f325cb5
--- /dev/null
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -0,0 +1,15 @@
+// This is an auto-generated file. Please do not edit/modify this file.
+package com.airbnb.android.showkase_processor_testing
+
+import androidx.compose.runtime.Composable
+import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
+
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+        group = "group",
+        componentName = "name",
+        componentKDoc = "",
+        componentKey =
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_group_name_0_null""",
+        isDefaultStyle = false,
+        component = @Composable { TestComposable() }
+    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
deleted file mode 100644
index 95192d33..00000000
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is an auto-generated file. Please do not edit/modify this file.
-package com.airbnb.android.showkase_processor_testing
-
-import androidx.compose.runtime.Composable
-import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
-
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
-        group = "group",
-        componentName = "name",
-        componentKDoc = "",
-        componentKey = """com.airbnb.android.showkase_processor_testing_null_group_name_0_null""",
-        isDefaultStyle = false,
-        component = @Composable { TestComposable() }
-    )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 1fcb4115..06c9e6dd 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcomponentname",
+    generatedPropertyName = "TestComposablecomponentname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun componentname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablecomponentname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,10 +31,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcolorname",
+    generatedPropertyName = "redcolorname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COLOR",
   )
-  public fun colorname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassredcolorname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
index 9a05bbf0..5ffef5af 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingcomponentname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablecomponentname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "component",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_component_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_component_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redcolorname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redcolorname.kt
index 02fae3c8..3acde368 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcolorname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_color_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/redcolorname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingcolorname: ShowkaseBrowserColor = 
+public val redcolorname: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "color",
         colorName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 5a83a8cf..2c2f6d00 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcomponentname",
+    generatedPropertyName = "TestComposablecomponentname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun componentname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablecomponentname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,10 +31,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingtypographyname",
+    generatedPropertyName = "titletypographyname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun typographyname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClasstitletypographyname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
index 9a05bbf0..5ffef5af 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/TestComposablecomponentname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingcomponentname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablecomponentname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "component",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_component_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_component_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/titletypographyname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/titletypographyname.kt
index 5320f75d..61550f15 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_composable_with_wrapped_textstyle_property_with_ShowkaseColor_annotation_generates_only_metadata_file/output/titletypographyname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingtypographyname: ShowkaseBrowserTypography = 
+public val titletypographyname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "typography",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 974749ff..81611062 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "TestComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposableDefaultGroupTestComposable():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,12 +32,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2",
+    generatedPropertyName = "TestComposable2DefaultGroupTestComposable2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun DefaultGroupTestComposable2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2DefaultGroupTestComposable2():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
index 63e1830b..75feb244 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
-    List<ShowkaseBrowserComponent> = 
+public val TestComposable2DefaultGroupTestComposable2: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -17,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
                     componentName = "TestComposable2",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable2_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposable2_null_DefaultGroup_TestComposable2_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable2(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
index 316a20ac..1509a7f7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
index b1e79aa5..3faf8350 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
@@ -18,9 +18,9 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return mutableListOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable,
+        TestComposableDefaultGroupTestComposable,
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2)
+        addAll(TestComposable2DefaultGroupTestComposable2)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 17713829..2aa36261 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "TestComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposableDefaultGroupTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
index 316a20ac..1509a7f7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
index f595e661..c7d26df0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable,
+        TestComposableDefaultGroupTestComposable,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index d1fde7f9..ee1e4544 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "testComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtestComposableDefaultGroupTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
index 92527897..6371a1ec 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_testComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { testComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index c64f1c91..e4dc2171 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,10 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupTestComposable",
+    generatedPropertyName = "testComposablegroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtestComposablegroupTestComposable(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/TestShowkaseRootCodegen.kt
index 0e3e2fb9..cb97f908 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestinggroupTestComposable,
+        testComposablegroupTestComposable,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/testComposablegroupTestComposable.kt
similarity index 66%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/testComposablegroupTestComposable.kt
index e47c354a..4207a227 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name/output/testComposablegroupTestComposable.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupTestComposable: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val testComposablegroupTestComposable: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_group_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_testComposable_null_group_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { testComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 17713829..2aa36261 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "TestComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposableDefaultGroupTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
index 316a20ac..1509a7f7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
index f595e661..c7d26df0 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable,
+        TestComposableDefaultGroupTestComposable,
     )
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index d1fde7f9..ee1e4544 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,10 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "testComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtestComposableDefaultGroupTestComposable():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
index 92527897..6371a1ec 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_annotation_and_no_name_or_group/output/testComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val testComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_testComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { testComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 974749ff..81611062 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,12 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable",
+    generatedPropertyName = "TestComposableDefaultGroupTestComposable",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun DefaultGroupTestComposable(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposableDefaultGroupTestComposable():
+      Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -31,12 +32,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2",
+    generatedPropertyName = "TestComposable2DefaultGroupTestComposable2",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun DefaultGroupTestComposable2(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposable2DefaultGroupTestComposable2():
+      Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
index 63e1830b..75feb244 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_only_generates_screenshot_test_for_only_non_preview_parameter_composable/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposable2DefaultGroupTestComposable2.kt
@@ -5,8 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
-    List<ShowkaseBrowserComponent> = 
+public val TestComposable2DefaultGroupTestComposable2: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -17,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2:
                     componentName = "TestComposable2",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable2_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing_TestComposable2_null_DefaultGroup_TestComposable2_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable { TestComposable2(text = previewParam) }
                 )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
similarity index 65%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
index 316a20ac..1509a7f7 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_preview_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestComposableDefaultGroupTestComposable.kt
@@ -4,13 +4,13 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable:
-    ShowkaseBrowserComponent = ShowkaseBrowserComponent(
+public val TestComposableDefaultGroupTestComposable: ShowkaseBrowserComponent =
+    ShowkaseBrowserComponent(
         group = "Default Group",
         componentName = "TestComposable",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_DefaultGroup_TestComposable_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_DefaultGroup_TestComposable_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
index b1e79aa5..3faf8350 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_and_no_name_or_group/output/TestShowkaseRootCodegen.kt
@@ -18,9 +18,9 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return mutableListOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable,
+        TestComposableDefaultGroupTestComposable,
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestingDefaultGroupTestComposable2)
+        addAll(TestComposable2DefaultGroupTestComposable2)
     }
   }
 
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a81a4f4b..b9e4ad60 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupRed",
+    generatedPropertyName = "redDefaultGroupRed",
     showkaseMetadataType = "COLOR",
   )
-  public fun DefaultGroupRed(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingredDefaultGroupRed(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupRed.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/redDefaultGroupRed.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupRed.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/redDefaultGroupRed.kt
index 8922853c..37edb5e8 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupRed.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_color_annotation_and_no_name_or_group/output/redDefaultGroupRed.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserColor
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupRed: ShowkaseBrowserColor = 
+public val redDefaultGroupRed: ShowkaseBrowserColor = 
     ShowkaseBrowserColor(
         colorGroup = "Default Group",
         colorName = "Red",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index aa0d8899..fdc82e15 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingDefaultGroupTitle",
+    generatedPropertyName = "titleDefaultGroupTitle",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun DefaultGroupTitle(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitleDefaultGroupTitle(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTitle.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/titleDefaultGroupTitle.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTitle.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/titleDefaultGroupTitle.kt
index 6d611db4..7d86ddd8 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/comairbnbandroidshowkaseprocessortestingDefaultGroupTitle.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_property_with_showkase_typography_annotation_and_no_name_or_group/output/titleDefaultGroupTitle.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingDefaultGroupTitle: ShowkaseBrowserTypography = 
+public val titleDefaultGroupTitle: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "Default Group",
         typographyName = "Title",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index e06f28f6..126601eb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
index c437f5ad..a5aa2011 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/TestShowkaseRootCodegen.kt
@@ -30,7 +30,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        titlegroupname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/titlegroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/titlegroupname.kt
index 4731f9e7..c49c362f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 3abea50f..94eb9e55 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,11 +14,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingcomponentname",
+    generatedPropertyName = "TestComposablecomponentname",
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun componentname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingTestComposablecomponentname(): Unit {
   }
 
   @ShowkaseCodegenMetadata(
@@ -30,9 +30,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestingtypographyname",
+    generatedPropertyName = "titletypographyname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun typographyname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitletypographyname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
similarity index 67%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
index 9a05bbf0..5ffef5af 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingcomponentname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestComposablecomponentname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestingcomponentname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablecomponentname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "component",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_null_component_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing_TestComposable_null_component_name_0_null""",
         isDefaultStyle = false,
         component = @Composable { TestComposable() }
     )
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
index 24c9f6d1..97ed8009 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -18,7 +18,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseComponents(): List<ShowkaseBrowserComponent> {
 
     return listOf<ShowkaseBrowserComponent>(
-        comairbnbandroidshowkaseprocessortestingcomponentname,
+        TestComposablecomponentname,
     )
   }
 
@@ -31,7 +31,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestingtypographyname,
+        titletypographyname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/titletypographyname.kt
similarity index 78%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/titletypographyname.kt
index 1e7de676..4c1a56a3 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/comairbnbandroidshowkaseprocessortestingtypographyname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_and_composable_function_generates_1_file/output/titletypographyname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestingtypographyname: ShowkaseBrowserTypography = 
+public val titletypographyname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "typography",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index e06f28f6..126601eb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/titlegroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/titlegroupname.kt
index 4731f9e7..c49c362f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_and_class_with_@ScreenshotTest_generates_screenshot_test_for_composable/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index e06f28f6..126601eb 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "titlegroupname",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitlegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
index c437f5ad..a5aa2011 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/TestShowkaseRootCodegen.kt
@@ -30,7 +30,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestinggroupname,
+        titlegroupname,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/titlegroupname.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/titlegroupname.kt
index 4731f9e7..c49c362f 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_ShowkaseTypography_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_generates_1_file/output/titlegroupname.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserTypography = 
+public val titlegroupname: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "name",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 79c1db09..5e068e35 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -14,9 +14,9 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = false,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupTitle",
+    generatedPropertyName = "titlegroupTitle",
     showkaseMetadataType = "TYPOGRAPHY",
   )
-  public fun groupTitle(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingtitlegroupTitle(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/TestShowkaseRootCodegen.kt
index 1b35acdf..58749932 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/TestShowkaseRootCodegen.kt
@@ -30,7 +30,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
   public override fun getShowkaseTypography(): List<ShowkaseBrowserTypography> {
 
     return listOf<ShowkaseBrowserTypography>(
-        comairbnbandroidshowkaseprocessortestinggroupTitle,
+        titlegroupTitle,
     )
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTitle.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/titlegroupTitle.kt
similarity index 79%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTitle.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/titlegroupTitle.kt
index d8749703..da928a5e 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/comairbnbandroidshowkaseprocessortestinggroupTitle.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/top_level_textstyle_property_with_showkasetypography_and_showkaseroot_with_no_name/output/titlegroupTitle.kt
@@ -3,7 +3,7 @@ package com.airbnb.android.showkase_processor_testing
 
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 
-public val comairbnbandroidshowkaseprocessortestinggroupTitle: ShowkaseBrowserTypography = 
+public val titlegroupTitle: ShowkaseBrowserTypography = 
     ShowkaseBrowserTypography(
         typographyGroup = "group",
         typographyName = "Title",
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index a0a98466..0a0af554 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -15,11 +15,11 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 64%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 3e7900fc..0a3c2f17 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/composable_function_inside_class_with_showkase_annotation_and_showkaseroot_generates_1_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_preview_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -4,13 +4,12 @@ package com.airbnb.android.showkase_processor_testing
 import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: ShowkaseBrowserComponent =
-    ShowkaseBrowserComponent(
+public val TestComposablegroupname: ShowkaseBrowserComponent = ShowkaseBrowserComponent(
         group = "group",
         componentName = "name",
         componentKDoc = "",
         componentKey =
-            """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
+            """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null""",
         isDefaultStyle = false,
         component = @Composable {
             WrapperClass().TestComposable()
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 17adf4f8..2102ee79 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -16,13 +16,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
index 22f66ecf..b8dec99c 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_composable_function_with_showkase_annotation_generates_only_metadata_file/output/TestComposablegroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable {
                         WrapperClass().TestComposable(text = previewParam)
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
index 17adf4f8..2102ee79 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt
@@ -16,13 +16,13 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
     insideObject = false,
     insideWrapperClass = true,
     showkaseKDoc = "",
-    generatedPropertyName = "comairbnbandroidshowkaseprocessortestinggroupname",
+    generatedPropertyName = "TestComposablegroupname",
     enclosingClass = [WrapperClass::class],
     showkaseMetadataType = "COMPONENT",
     isDefaultStyle = false,
     previewParameterClass = [ParameterProvider::class],
     previewParameterName = "text",
   )
-  public fun groupname(): Unit {
+  public fun comairbnbandroidshowkaseprocessortestingWrapperClassTestComposablegroupname(): Unit {
   }
 }
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/comairbnbandroidshowkaseprocessortestinggroupname.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestComposablegroupname.kt
similarity index 82%
rename from showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
rename to showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestComposablegroupname.kt
index 22f66ecf..b8dec99c 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/comairbnbandroidshowkaseprocessortestinggroupname.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestComposablegroupname.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
 import kotlin.collections.List
 
-public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrowserComponent> = 
+public val TestComposablegroupname: List<ShowkaseBrowserComponent> = 
     ParameterProvider()
         .values
         .iterator()
@@ -16,7 +16,7 @@ public val comairbnbandroidshowkaseprocessortestinggroupname: List<ShowkaseBrows
                     componentName = "name",
                     componentKDoc = "",
                     componentKey =
-                        """com.airbnb.android.showkase_processor_testing_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
+                        """com.airbnb.android.showkase_processor_testing.WrapperClass_TestComposable_com.airbnb.android.showkase_processor_testing.WrapperClass_group_name_0_null_$index""",
                     isDefaultStyle = false,
                     component = @Composable {
                         WrapperClass().TestComposable(text = previewParam)
diff --git a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestShowkaseRootCodegen.kt b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestShowkaseRootCodegen.kt
index 93febe07..d7322dd1 100644
--- a/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestShowkaseRootCodegen.kt
+++ b/showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/wrapped_function_with_showkase_composable_and_preview_parameter_and_showkaseroot_/output/TestShowkaseRootCodegen.kt
@@ -19,7 +19,7 @@ public class TestShowkaseRootCodegen : ShowkaseProvider {
 
     return mutableListOf<ShowkaseBrowserComponent>(
     ).apply {
-        addAll(comairbnbandroidshowkaseprocessortestinggroupname)
+        addAll(TestComposablegroupname)
     }
   }
 
diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt
index f55f9b9d..2143e57e 100644
--- a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt
+++ b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/ShowkaseProcessor.kt
@@ -275,12 +275,12 @@ class ShowkaseProcessor @JvmOverloads constructor(
     }
 
     private fun Collection<ShowkaseMetadata.Component>.dedupeAndSort() = this.distinctBy {
-        // It's possible that a composable annotation is annotated with both Preview & 
+        // It's possible that a composable annotation is annotated with both Preview &
         // ShowkaseComposable(especially if we add more functionality to Showkase and they diverge
         // in the customizations that they offer). In that scenario, its important to dedupe the
         // composables as they will be processed across both the rounds. We first ensure that
-        // only distict method's are passed onto the next round. We do this by deduping on 
-        // the combination of packageName, the wrapper class when available(otherwise it 
+        // only distict method's are passed onto the next round. We do this by deduping on
+        // the combination of packageName, the wrapper class when available(otherwise it
         // will be null) & the methodName.
         if (it.componentIndex != null) {
             "${it.packageName}_${it.enclosingClassName}_${it.elementName}_${it.componentIndex}"
@@ -290,16 +290,18 @@ class ShowkaseProcessor @JvmOverloads constructor(
         }
     }
         .distinctBy {
-            // We also ensure that the component groupName and the component name are unique so 
-            // that they don't show up twice in the browser app.
+            // We also ensure that the component groupName and the component name are unique so
+            // that they don't show up twice in the browser app. This also de-duplicates based
+            // on the fully qualified function name to support categorization with additional
+            // fields (e.g. tags, extraMetadata, etc) on custom browsers.
             if (it.componentIndex != null) {
-                "${it.showkaseName}_${it.showkaseGroup}_${it.showkaseStyleName}_${it.componentIndex}"
+                "${it.fqPrefix}_${it.showkaseName}_${it.showkaseGroup}_${it.showkaseStyleName}_${it.componentIndex}"
             } else {
-                "${it.showkaseName}_${it.showkaseGroup}_${it.showkaseStyleName}"
+                "${it.fqPrefix}_${it.showkaseName}_${it.showkaseGroup}_${it.showkaseStyleName}"
             }
         }
         .sortedBy {
-            "${it.packageName}_${it.enclosingClassName}_${it.elementName}"
+            it.fqPrefix
         }
 
     private fun processColorAnnotation(roundEnvironment: XRoundEnv): Set<ShowkaseMetadata> {
diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/models/ShowkaseMetadata.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/models/ShowkaseMetadata.kt
index 8fb24d80..b5b1eea8 100644
--- a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/models/ShowkaseMetadata.kt
+++ b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/models/ShowkaseMetadata.kt
@@ -42,6 +42,10 @@ internal sealed class ShowkaseMetadata {
     abstract val insideWrapperClass: Boolean
     abstract val insideObject: Boolean
 
+    /** A fully qualified prefix for use when de-duplicating components. **/
+    val fqPrefix: String
+        get() = enclosingClassName?.let {"${it}_$elementName" } ?: "${packageName}_$elementName"
+
     data class Component(
         override val element: XElement,
         override val packageName: String,
diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/ShowkaseCodegenMetadataWriter.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/ShowkaseCodegenMetadataWriter.kt
index 77703dc3..ea0abb76 100644
--- a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/ShowkaseCodegenMetadataWriter.kt
+++ b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/ShowkaseCodegenMetadataWriter.kt
@@ -36,9 +36,11 @@ internal class ShowkaseCodegenMetadataWriter(private val environment: XProcessin
                 && showkaseMetadata.componentIndex != null
                 && showkaseMetadata.componentIndex > 0
             ) {
-                "${showkaseMetadata.showkaseGroup}_${showkaseMetadata.showkaseName}_${showkaseMetadata.componentIndex}"
+                "${showkaseMetadata.fqPrefix}_${showkaseMetadata.showkaseGroup}" +
+                    "_${showkaseMetadata.showkaseName}_${showkaseMetadata.componentIndex}"
             } else {
-                "${showkaseMetadata.showkaseGroup}_${showkaseMetadata.showkaseName}"
+                "${showkaseMetadata.fqPrefix}_${showkaseMetadata.showkaseGroup}" +
+                    "_${showkaseMetadata.showkaseName}"
             }
             val methodName = if (showkaseMetadata is ShowkaseMetadata.Component
                 && showkaseMetadata.showkaseStyleName != null
diff --git a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/WriterUtils.kt b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/WriterUtils.kt
index c05c33e6..efe3eda3 100644
--- a/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/WriterUtils.kt
+++ b/showkase-processor/src/main/java/com/airbnb/android/showkase/processor/writer/WriterUtils.kt
@@ -107,7 +107,7 @@ internal fun CodeBlock.Builder.addShowkaseBrowserComponent(
     } else {
         "_${showkaseMetadata.showkaseName}"
     }
-    var componentKey = (showkaseMetadata.packageName +
+    var componentKey = (showkaseMetadata.fqPrefix +
             "_${showkaseMetadata.enclosingClassName}" +
             "_${showkaseMetadata.showkaseGroup}" +
             componentName +
@@ -323,10 +323,10 @@ internal fun generatePropertyNameFromMetadata(
             val name =
                 if (metadata.componentIndex != null && metadata.componentIndex > 0
                 ) {
-                    "${metadata.packageName}_${metadata.showkaseGroup}_" +
+                    "${metadata.elementName}_${metadata.showkaseGroup}_" +
                             "${metadata.showkaseName}_${metadata.componentIndex}"
                 } else {
-                    "${metadata.packageName}_${metadata.showkaseGroup}_${metadata.showkaseName}"
+                    "${metadata.elementName}_${metadata.showkaseGroup}_${metadata.showkaseName}"
                 }
             val propertyName = if (metadata.showkaseStyleName != null) {
                 "${name}_${metadata.showkaseStyleName}"
@@ -336,7 +336,7 @@ internal fun generatePropertyNameFromMetadata(
             propertyName
         }
         else -> {
-            "${metadata.packageName}_${metadata.showkaseGroup}_${metadata.showkaseName}"
+            "${metadata.elementName}_${metadata.showkaseGroup}_${metadata.showkaseName}"
                 .filter { it.isLetterOrDigit() }
         }
     }