diff --git a/src/Tgstation.Server.Api/Models/Configuration.cs b/src/Tgstation.Server.Api/Models/Configuration.cs
index 8497408366..4b750c9e6a 100644
--- a/src/Tgstation.Server.Api/Models/Configuration.cs
+++ b/src/Tgstation.Server.Api/Models/Configuration.cs
@@ -5,8 +5,10 @@ namespace Tgstation.Server.Api.Models
 	/// <summary>
 	/// Represents a static game file. Create and delete actions uncerimonuously overwrite/delete files
 	/// </summary>
+#pragma warning disable CA1724 // System.Configuration name conflict
 	[Model(RightsType.Configuration, CanCrud = true, CanList = true, RequiresInstance = true, ReadRight = ConfigurationRights.Read, WriteRight = ConfigurationRights.Write)]
 	public sealed class Configuration
+#pragma warning restore CA1724 // System.Configuration name conflict
 	{
 		/// <summary>
 		/// The path to the <see cref="Configuration"/> file
diff --git a/src/Tgstation.Server.Api/Models/Instance.cs b/src/Tgstation.Server.Api/Models/Instance.cs
index cbe4334161..43d3eea404 100644
--- a/src/Tgstation.Server.Api/Models/Instance.cs
+++ b/src/Tgstation.Server.Api/Models/Instance.cs
@@ -29,7 +29,7 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// If the <see cref="Instance"/> is online
 		/// </summary>
-		[Permissions(ComplexWrite = true)]
+		[Permissions(WriteRight = InstanceManagerRights.SetOnline)]
 		public bool Online { get; set; }
 	}
 }
diff --git a/src/Tgstation.Server.Api/Models/Repository.cs b/src/Tgstation.Server.Api/Models/Repository.cs
index d4411e7d45..57c1a14f7d 100644
--- a/src/Tgstation.Server.Api/Models/Repository.cs
+++ b/src/Tgstation.Server.Api/Models/Repository.cs
@@ -12,7 +12,7 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// The origin URL. If <see langword="null"/>, the <see cref="Repository"/> does not exist
 		/// </summary>
-		[Permissions(ComplexWrite = true)]
+		[Permissions(WriteRight = RepositoryRights.SetOrigin)]
 		public string Origin { get; set; }
 
 		/// <summary>
@@ -24,7 +24,7 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// The branch or tag HEAD points to
 		/// </summary>
-		[Permissions(ComplexWrite = true)]
+		[Permissions(WriteRight = RepositoryRights.SetReference)]
 		public string Reference { get; set; }
 
 		/// <summary>
@@ -48,7 +48,7 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// Associated list of GitHub pull request number -> sha for merged pull requests. Adding a <see langword="null"/> value to this list will merge the latest commit of the pull request numbered by the key
 		/// </summary>
-		[Permissions(ComplexWrite = true)]
+		[Permissions(WriteRight = RepositoryRights.MergePullRequest)]
 		public Dictionary<int, string> PullRequests { get; set; }
 		
 		/// <summary>
diff --git a/src/Tgstation.Server.Api/PermissionsAttribute.cs b/src/Tgstation.Server.Api/PermissionsAttribute.cs
index fd35005dcb..7d4962758f 100644
--- a/src/Tgstation.Server.Api/PermissionsAttribute.cs
+++ b/src/Tgstation.Server.Api/PermissionsAttribute.cs
@@ -22,10 +22,5 @@ namespace Tgstation.Server.Api
 		/// If the field cannot be written to
 		/// </summary>
 		public bool DenyWrite { get; set; }
-
-		/// <summary>
-		/// If the field has multiple write permissions
-		/// </summary>
-		public bool ComplexWrite { get; set; }
 	}
 }
diff --git a/src/Tgstation.Server.Api/Rights/InstanceManagerRights.cs b/src/Tgstation.Server.Api/Rights/InstanceManagerRights.cs
index 31a7eea0d3..a00d4ffedc 100644
--- a/src/Tgstation.Server.Api/Rights/InstanceManagerRights.cs
+++ b/src/Tgstation.Server.Api/Rights/InstanceManagerRights.cs
@@ -31,18 +31,14 @@ namespace Tgstation.Server.Api.Rights
 		/// <summary>
 		/// User can online <see cref="Models.Instance"/>s they can view
 		/// </summary>
-		Online = 16,
-		/// <summary>
-		/// User can offline <see cref="Models.Instance"/>s they can view
-		/// </summary>
-		Offline = 32,
+		SetOnline = 16,
 		/// <summary>
 		/// User can delete <see cref="Models.Instance"/>s they can view
 		/// </summary>
-		Delete = 64,
+		Delete = 32,
 		/// <summary>
 		/// User can view all <see cref="Models.Instance"/>s
 		/// </summary>
-		List = 128
+		List = 64
 	}
 }
diff --git a/src/Tgstation.Server.Api/Rights/RepositoryRights.cs b/src/Tgstation.Server.Api/Rights/RepositoryRights.cs
index a17ab1c6f8..80339d9d7f 100644
--- a/src/Tgstation.Server.Api/Rights/RepositoryRights.cs
+++ b/src/Tgstation.Server.Api/Rights/RepositoryRights.cs
@@ -45,16 +45,12 @@ namespace Tgstation.Server.Api.Rights
 		/// </summary>
 		ChangeCredentials = 256,
 		/// <summary>
-		/// User may reset the <see cref="Models.Repository"/>'s HEAD to the origin reference of whatever branch it is tracking
+		/// User may set <see cref="Models.Repository.Reference"/> to another git reference (not a SHA)
 		/// </summary>
-		Reset = 512,
+		SetReference = 512,
 		/// <summary>
 		/// User may read all fields in the <see cref="Models.Repository"/> with the exception of <see cref="Models.Repository.AccessToken"/>
 		/// </summary>
 		Read = 1024,
-		/// <summary>
-		/// User may set <see cref="Models.Repository.Reference"/> to a backup tag
-		/// </summary>
-		CheckoutBackup = 2048,
 	}
 }