diff --git a/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator.go b/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator.go
index cad15d1..b4815eb 100644
--- a/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator.go
+++ b/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator.go
@@ -50,17 +50,17 @@ func NewService(
 func (s *Service) GenerateFile(out iotools.Out, path string, args types.KeyValueArgs) error {
 	fileExists, err := s.fileReader.FileExists(path)
 	if err != nil {
-		return fmt.Errorf("the path: '%s': %w: %w", path, ErrCheckingFileExistence, err)
+		return fmt.Errorf("the '%s' file path: %w: %w", path, ErrCheckingFileExistence, err)
 	}
 
 	if fileExists {
-		out.Write(fmt.Sprintf("the path: '%s' file already exists, reusing: '%s'\n", s.kind, path))
+		out.Write(fmt.Sprintf("the '%s' file path already exists, reusing: '%s'\n", s.kind, path))
 		return nil
 	}
 
 	err = s.fileGenerator.GenerateFile(out, path, args)
 	if err != nil {
-		return fmt.Errorf("the path: '%s': %w: %w", path, ErrGeneratingFile, err)
+		return fmt.Errorf("the '%s' file path: %w: %w", path, ErrGeneratingFile, err)
 	}
 
 	return nil
diff --git a/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator_test.go b/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator_test.go
index 968231f..9157a31 100644
--- a/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator_test.go
+++ b/internal/service/filegenerator/reusefilegenerator/reuse_filegenerator_test.go
@@ -51,7 +51,7 @@ func Test_GenerateFile_Succeeds_WhenFileDoesAlreadyExist(t *testing.T) {
 
 	require.NoError(t, result)
 	require.Len(t, out.sink, 1)
-	assert.Equal(t, "the path: 'test-kind' file already exists, reusing: 'some-path'\n", out.sink[0])
+	assert.Equal(t, "the 'test-kind' file path already exists, reusing: 'some-path'\n", out.sink[0])
 }
 
 func Test_GenerateFile_ReturnsError_WhenFileGenerationReturnsError(t *testing.T) {
diff --git a/internal/service/scaffold/options.go b/internal/service/scaffold/options.go
index 2e5398f..bc9e26f 100644
--- a/internal/service/scaffold/options.go
+++ b/internal/service/scaffold/options.go
@@ -58,7 +58,7 @@ func (opts Options) validateDirectory() error {
 	fileInfo, err := os.Stat(opts.Directory)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("directory %s does not exist: %w: ", opts.Directory, commonerrors.ErrInvalidOption)
+			return fmt.Errorf("directory %s does not exist: %w:", opts.Directory, commonerrors.ErrInvalidOption)
 		}
 		return fmt.Errorf("failed to get directory info %s: %w: %w", opts.Directory, commonerrors.ErrInvalidOption, err)
 	}
@@ -72,7 +72,7 @@ func (opts Options) validateDirectory() error {
 
 func (opts Options) validateModuleName() error {
 	if err := validation.ValidateModuleName(opts.ModuleName); err != nil {
-		return fmt.Errorf("module name: %w: %w", commonerrors.ErrInvalidOption, err)
+		return fmt.Errorf("opts.ModuleName: %w: %w", commonerrors.ErrInvalidOption, err)
 	}
 
 	return nil
@@ -80,7 +80,7 @@ func (opts Options) validateModuleName() error {
 
 func (opts Options) validateVersion() error {
 	if err := validation.ValidateModuleVersion(opts.ModuleVersion); err != nil {
-		return fmt.Errorf("module version: %w: %w", commonerrors.ErrInvalidOption, err)
+		return fmt.Errorf("opts.ModuleVersion: %w", err)
 	}
 
 	return nil