diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 02246f0f0..141f68d5e 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -1,7 +1,7 @@
 package org.linphone;
 /*
-InCallActivity.java
-Copyright (C) 2012  Belledonne Communications, Grenoble, France
+CallActivity.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -87,8 +87,8 @@ public class CallActivity extends Activity implements OnClickListener {
 	private LinearLayout routeLayout, mNoCurrentCall, callInfo;
 	private ProgressBar videoProgress;
 	private StatusFragment status;
-	private AudioCallFragment audioCallFragment;
-	private VideoCallFragment videoCallFragment;
+	private CallAudioFragment audioCallFragment;
+	private CallVideoFragment videoCallFragment;
 	private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed, isAnimationDisabled;
 	private LinearLayout mControlsLayout;
 	private Numpad numpad;
@@ -245,16 +245,16 @@ public class CallActivity extends Activity implements OnClickListener {
 
 			Fragment callFragment;
 			if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
-				callFragment = new VideoCallFragment();
-				videoCallFragment = (VideoCallFragment) callFragment;
+				callFragment = new CallVideoFragment();
+				videoCallFragment = (CallVideoFragment) callFragment;
 				isSpeakerEnabled = true;
 
 				if (cameraNumber > 1) {
 					switchCamera.setVisibility(View.VISIBLE);
 				}
 			} else {
-				callFragment = new AudioCallFragment();
-				audioCallFragment = (AudioCallFragment) callFragment;
+				callFragment = new CallAudioFragment();
+				audioCallFragment = (CallAudioFragment) callFragment;
 				switchCamera.setVisibility(View.INVISIBLE);
 			}
 
@@ -729,7 +729,7 @@ public class CallActivity extends Activity implements OnClickListener {
 	}
 
 	private void replaceFragmentVideoByAudio() {
-		audioCallFragment = new AudioCallFragment();
+		audioCallFragment = new CallAudioFragment();
 		FragmentTransaction transaction = getFragmentManager().beginTransaction();
 		transaction.replace(R.id.fragmentContainer, audioCallFragment);
 		try {
@@ -740,7 +740,7 @@ public class CallActivity extends Activity implements OnClickListener {
 
 	private void replaceFragmentAudioByVideo() {
 //		Hiding controls to let displayVideoCallControlsIfHidden add them plus the callback
-		videoCallFragment = new VideoCallFragment();
+		videoCallFragment = new CallVideoFragment();
 
 		FragmentTransaction transaction = getFragmentManager().beginTransaction();
 		transaction.replace(R.id.fragmentContainer, videoCallFragment);
@@ -1364,11 +1364,11 @@ public class CallActivity extends Activity implements OnClickListener {
 		return super.onKeyDown(keyCode, event);
 	}
 
-	public void bindAudioFragment(AudioCallFragment fragment) {
+	public void bindAudioFragment(CallAudioFragment fragment) {
 		audioCallFragment = fragment;
 	}
 
-	public void bindVideoFragment(VideoCallFragment fragment) {
+	public void bindVideoFragment(CallVideoFragment fragment) {
 		videoCallFragment = fragment;
 	}
 
diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/CallAudioFragment.java
similarity index 95%
rename from src/org/linphone/AudioCallFragment.java
rename to src/org/linphone/CallAudioFragment.java
index 2105a9c8b..a2fed87da 100644
--- a/src/org/linphone/AudioCallFragment.java
+++ b/src/org/linphone/CallAudioFragment.java
@@ -1,7 +1,7 @@
 package org.linphone;
 /*
-AudioCallFragment.java
-Copyright (C) 2012  Belledonne Communications, Grenoble, France
+CallAudioFragment.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
 /**
  * @author Sylvain Berfini
  */
-public class AudioCallFragment extends Fragment {	
+public class CallAudioFragment extends Fragment {
 	private CallActivity incallActvityInstance;
 	
 	@Override
diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/CallVideoFragment.java
similarity index 98%
rename from src/org/linphone/VideoCallFragment.java
rename to src/org/linphone/CallVideoFragment.java
index 6671c1731..4e1470e97 100644
--- a/src/org/linphone/VideoCallFragment.java
+++ b/src/org/linphone/CallVideoFragment.java
@@ -1,7 +1,7 @@
 package org.linphone;
 /*
-VideoCallFragment.java
-Copyright (C) 2012  Belledonne Communications, Grenoble, France
+CallVideoFragment.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ import android.view.ViewGroup;
 /**
  * @author Sylvain Berfini
  */
-public class VideoCallFragment extends Fragment implements OnGestureListener, OnDoubleTapListener, CompatibilityScaleGestureListener {
+public class CallVideoFragment extends Fragment implements OnGestureListener, OnDoubleTapListener, CompatibilityScaleGestureListener {
 	private SurfaceView mVideoView;
 	private SurfaceView mCaptureView;
 	private AndroidVideoWindowImpl androidVideoWindowImpl;