3 files changed, 4 insertions, 4 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 41c0217a..36e62f04 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -21,9 +21,9 @@ type CreateRepoForm struct {
 	RepoName    string `form:"repo_name" binding:"Required;AlphaDashDot;MaxSize(100)"`
 	Private     bool   `form:"private"`
 	Description string `form:"desc" binding:"MaxSize(255)"`
+	AutoInit    bool   `form:"auto_init"`
 	Gitignore   string `form:"gitignore"`
 	License     string `form:"license"`
-	InitReadme  bool   `form:"init_readme"`
 }
 
 func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index be102989..e6872586 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -48,7 +48,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
 		ctx.Data["Org"] = org
 
 		if ctx.IsSigned {
-			ctx.Org.IsOwner = org.IsOrgOwner(ctx.User.Id)
+			ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id)
 			if ctx.Org.IsOwner {
 				ctx.Org.IsMember = true
 				ctx.Org.IsAdminTeam = true
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 8b0f0c59..17161949 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -55,7 +55,7 @@ func ApiRepoAssignment() macaron.Handler {
 		ctx.Repo.Owner = u
 
 		// Organization owner team members are true owners as well.
-		if ctx.IsSigned && ctx.Repo.Owner.IsOrganization() && ctx.Repo.Owner.IsOrgOwner(ctx.User.Id) {
+		if ctx.IsSigned && ctx.Repo.Owner.IsOrganization() && ctx.Repo.Owner.IsOwnedBy(ctx.User.Id) {
 			ctx.Repo.IsTrueOwner = true
 		}
 
@@ -280,7 +280,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 		ctx.Repo.Owner = u
 
 		// Organization owner team members are true owners as well.
-		if ctx.IsSigned && ctx.Repo.Owner.IsOrganization() && ctx.Repo.Owner.IsOrgOwner(ctx.User.Id) {
+		if ctx.IsSigned && ctx.Repo.Owner.IsOrganization() && ctx.Repo.Owner.IsOwnedBy(ctx.User.Id) {
 			ctx.Repo.IsTrueOwner = true
 		}