diff --git a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
index 52bfb09c7..e8cb6acd1 100644
--- a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
+++ b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
@@ -67,7 +67,7 @@ public class AtscTvInputScanActivity extends Activity {
     }
 
     private void clearChannels() {
-        String selection = TvContract.Channels.SERVICE_NAME + " = ?";
+        String selection = TvContract.Channels.COLUMN_SERVICE_NAME + " = ?";
         String[] selectionArgs = new String[] {
             AtscTvInputService.class.getName()
         };
@@ -92,11 +92,11 @@ public class AtscTvInputScanActivity extends Activity {
         Log.d(TAG, "Channel " + channel.getShortName() + " " + channel.getMajorChannelNumber()
                 + "-" + channel.getMinorChannelNumber() + " is detected.");
         ContentValues values = new ContentValues();
-        values.put(TvContract.Channels.SERVICE_NAME, AtscTvInputService.class.getName());
-        values.put(TvContract.Channels.DISPLAY_NUMBER,
+        values.put(TvContract.Channels.COLUMN_SERVICE_NAME, AtscTvInputService.class.getName());
+        values.put(TvContract.Channels.COLUMN_DISPLAY_NUMBER,
                 channel.getMajorChannelNumber() + "-" + channel.getMinorChannelNumber());
-        values.put(TvContract.Channels.DISPLAY_NAME, channel.getShortName());
-        values.put(TvContract.Channels.DATA, SampleTsStream.getTuneInfo(stream));
+        values.put(TvContract.Channels.COLUMN_DISPLAY_NAME, channel.getShortName());
+        values.put(TvContract.Channels.COLUMN_DATA, SampleTsStream.getTuneInfo(stream));
         getContentResolver().insert(TvContract.Channels.CONTENT_URI, values);
     }
 }
diff --git a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
index bbb791119..faefcee24 100644
--- a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
+++ b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
@@ -62,7 +62,7 @@ public class AtscTvInputService extends TvInputService {
 
 
     public TsStream getTsStreamForChannel(Uri channelUri) {
-        String[] projection = { TvContract.Channels.DATA };
+        String[] projection = { TvContract.Channels.COLUMN_DATA };
         if (channelUri == null) {
             return null;
         }
@@ -159,7 +159,7 @@ public class AtscTvInputService extends TvInputService {
         }
 
         private void clearPrograms(Uri channelUri) {
-            String selection = TvContract.Programs.CHANNEL_ID + " = ?";
+            String selection = TvContract.Programs.COLUMN_CHANNEL_ID + " = ?";
             String[] selectionArgs =
                     new String[] { Long.toString(ContentUris.parseId(channelUri)) };
             getContentResolver().delete(TvContract.Programs.CONTENT_URI, selection, selectionArgs);
@@ -168,11 +168,11 @@ public class AtscTvInputService extends TvInputService {
         private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) {
             Log.d(TAG, "insertProgram " + event.getTitleText());
             ContentValues values = new ContentValues();
-            values.put(TvContract.Programs.CHANNEL_ID, ContentUris.parseId(channelUri));
-            values.put(TvContract.Programs.TITLE, event.getTitleText());
-            values.put(TvContract.Programs.START_TIME_UTC_MILLIS, timeOffsetMs
+            values.put(TvContract.Programs.COLUMN_CHANNEL_ID, ContentUris.parseId(channelUri));
+            values.put(TvContract.Programs.COLUMN_TITLE, event.getTitleText());
+            values.put(TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS, timeOffsetMs
                     + event.getStartTime() * SEC_IN_MS);
-            values.put(TvContract.Programs.END_TIME_UTC_MILLIS, timeOffsetMs
+            values.put(TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS, timeOffsetMs
                     + (event.getStartTime() + event.getLengthInSecond()) * SEC_IN_MS);
             return getContentResolver().insert(
                     TvContract.Programs.CONTENT_URI, values);