diff --git a/src/builder.rs b/src/builder.rs
index 8c13dab..cb31fe2 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -97,15 +97,15 @@ pub async fn build_flatpak(
 
     let mut builder = FlatpakBuilder::new(flat_out, flat_repo, flat_bundles);
 
-    for extra_source in &mut flatpak_opts.flatpak_extra_sources {
+    for extra_source in &mut flatpak_opts.extra_sources {
         builder.add_extra_source(PathBuf::from(std::mem::take(extra_source)));
     }
 
-    for extra_source_url in &mut flatpak_opts.flatpak_extra_sources_url {
+    for extra_source_url in &mut flatpak_opts.extra_sources_url {
         builder.add_extra_source_url(std::mem::take(extra_source_url));
     }
 
-    if !flatpak_opts.flatpak_dont_delete_build_dir {
+    if !flatpak_opts.dont_delete_build_dir {
         builder.add_extra_args("--delete-build-dirs".to_string());
     }
 
@@ -270,7 +270,7 @@ pub async fn build_project(
 
     if let Some(rpmbuild) = &proj.rpm {
         if let Some(srcdir) = &rpmbuild.sources {
-            rpm_opts.sources = srcdir.clone();
+            rpm_opts.sources.clone_from(srcdir);
         }
         rpm_opts.no_mirror = rbopts.no_mirrors;
         rpm_opts.def_macro("_disable_source_fetch", "0");
diff --git a/src/cli.rs b/src/cli.rs
index 7f1c28a..0215783 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -70,16 +70,16 @@ pub struct FlatpakOpts {
     /// Flatpak: Extra source directory
     /// can be defined multiple times
     #[clap(long, group = "extra-source")]
-    pub flatpak_extra_sources: Vec<String>,
+    pub extra_sources: Vec<String>,
 
     /// Flatpak: Extra source URL
     /// can be defined multiple times
     #[clap(long)]
-    pub flatpak_extra_sources_url: Vec<String>,
+    pub extra_sources_url: Vec<String>,
 
     /// Flatpak: Do not delete the build directory
     #[clap(long, action)]
-    pub flatpak_dont_delete_build_dir: bool,
+    pub dont_delete_build_dir: bool,
 }
 
 #[derive(Args, Debug, Clone, Default)]