diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
index 533e8659968..5e623e2b965 100644
--- a/src/hotspot/share/ci/ciMethodData.cpp
+++ b/src/hotspot/share/ci/ciMethodData.cpp
@@ -537,8 +537,8 @@ void ciMethodData::clear_escape_info() {
   if (mdo != nullptr) {
     mdo->clear_escape_info();
     ArgInfoData *aid = arg_info();
-    int arg_count = (aid == nullptr) ? 0 : aid->number_of_args();
-    for (int i = 0; i < arg_count; i++) {
+    int arg_size = (aid == nullptr) ? 0 : aid->size_of_args();
+    for (int i = 0; i < arg_size; i++) {
       set_arg_modified(i, 0);
     }
   }
@@ -554,8 +554,8 @@ void ciMethodData::update_escape_info() {
     mdo->set_arg_local(_arg_local);
     mdo->set_arg_stack(_arg_stack);
     mdo->set_arg_returned(_arg_returned);
-    int arg_count = mdo->method()->size_of_parameters();
-    for (int i = 0; i < arg_count; i++) {
+    int arg_size = mdo->method()->size_of_parameters();
+    for (int i = 0; i < arg_size; i++) {
       mdo->set_arg_modified(i, arg_modified(i));
     }
   }
@@ -652,7 +652,7 @@ void ciMethodData::set_arg_modified(int arg, uint val) {
   ArgInfoData *aid = arg_info();
   if (aid == nullptr)
     return;
-  assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+  assert(arg >= 0 && arg < aid->size_of_args(), "valid argument number");
   aid->set_arg_modified(arg, val);
 }
 
@@ -672,7 +672,7 @@ uint ciMethodData::arg_modified(int arg) const {
   ArgInfoData *aid = arg_info();
   if (aid == nullptr)
     return 0;
-  assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+  assert(arg >= 0 && arg < aid->size_of_args(), "valid argument number");
   return aid->arg_modified(arg);
 }
 
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index ad1049ffa34..dc0b8fa9f81 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -667,8 +667,8 @@ void MultiBranchData::print_data_on(outputStream* st, const char* extra) const {
 
 void ArgInfoData::print_data_on(outputStream* st, const char* extra) const {
   print_shared(st, "ArgInfoData", extra);
-  int nargs = number_of_args();
-  for (int i = 0; i < nargs; i++) {
+  int args_size = size_of_args();
+  for (int i = 0; i < args_size; i++) {
     st->print("  0x%x", arg_modified(i));
   }
   st->cr();
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index 196537359b5..45529618afb 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -1751,7 +1751,7 @@ public:
   virtual bool is_ArgInfoData() const { return true; }
 
 
-  int number_of_args() const {
+  int size_of_args() const {
     return array_len();
   }
 
diff --git a/src/hotspot/share/oops/methodData.inline.hpp b/src/hotspot/share/oops/methodData.inline.hpp
index dee14d49253..b417ba867fc 100644
--- a/src/hotspot/share/oops/methodData.inline.hpp
+++ b/src/hotspot/share/oops/methodData.inline.hpp
@@ -59,7 +59,7 @@ inline uint MethodData::arg_modified(int a) {
   MutexLocker ml(extra_data_lock(), Mutex::_no_safepoint_check_flag);
   ArgInfoData* aid = arg_info();
   assert(aid != nullptr, "arg_info must be not null");
-  assert(a >= 0 && a < aid->number_of_args(), "valid argument number");
+  assert(a >= 0 && a < aid->size_of_args(), "valid argument number");
   return aid->arg_modified(a);
 }
 
@@ -68,7 +68,7 @@ inline void MethodData::set_arg_modified(int a, uint v) {
   MutexLocker ml(extra_data_lock(), Mutex::_no_safepoint_check_flag);
   ArgInfoData* aid = arg_info();
   assert(aid != nullptr, "arg_info must be not null");
-  assert(a >= 0 && a < aid->number_of_args(), "valid argument number");
+  assert(a >= 0 && a < aid->size_of_args(), "valid argument number");
   aid->set_arg_modified(a, v);
 }
 
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 85207fddf29..73082c6047d 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -867,8 +867,7 @@ static void jni_invoke_static(JNIEnv *env, JavaValue* result, jobject receiver,
   // Create object to hold arguments for the JavaCall, and associate it with
   // the jni parser
   ResourceMark rm(THREAD);
-  int number_of_parameters = method->size_of_parameters();
-  JavaCallArguments java_args(number_of_parameters);
+  JavaCallArguments java_args(method->size_of_parameters());
 
   assert(method->is_static(), "method should be static");
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index f50e6ddb3db..de140fb95ff 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1280,8 +1280,8 @@ WB_ENTRY(void, WB_ClearMethodState(JNIEnv* env, jobject o, jobject method))
   if (mdo != nullptr) {
     mdo->init();
     ResourceMark rm(THREAD);
-    int arg_count = mdo->method()->size_of_parameters();
-    for (int i = 0; i < arg_count; i++) {
+    int arg_size = mdo->method()->size_of_parameters();
+    for (int i = 0; i < arg_size; i++) {
       mdo->set_arg_modified(i, 0);
     }
     mdo->clean_method_data(/*always_clean*/true);