diff --git a/library/full-support/res/values/attrs.xml b/library/full-support/res/values/attrs.xml
index 86b2a56..7a2ff68 100644
--- a/library/full-support/res/values/attrs.xml
+++ b/library/full-support/res/values/attrs.xml
@@ -19,7 +19,7 @@
 
     <attr name="suwHasStableIds" format="boolean|reference" />
 
-    <declare-styleable name="SuwSetupWizardRecyclerItemsLayout">
+    <declare-styleable name="SuwSetupWizardRecyclerLayout">
         <attr name="android:entries" />
         <attr name="suwDividerInset" />
         <attr name="suwHasStableIds" />
diff --git a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerItemsLayout.java b/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerItemsLayout.java
deleted file mode 100644
index 23e7cef..0000000
--- a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerItemsLayout.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.setupwizardlib;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.setupwizardlib.items.RecyclerItemAdapter;
-
-/**
- * @deprecated Use {@link com.android.setupwizardlib.SetupWizardRecyclerLayout}
- */
-@Deprecated
-public class SetupWizardRecyclerItemsLayout extends SetupWizardRecyclerLayout {
-
-    public SetupWizardRecyclerItemsLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SetupWizardRecyclerItemsLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public RecyclerItemAdapter getAdapter() {
-        return (RecyclerItemAdapter) super.getAdapter();
-    }
-}
diff --git a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
index ddde2ae..087277f 100644
--- a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
+++ b/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
@@ -77,18 +77,18 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout {
 
     private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         final TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.SuwSetupWizardRecyclerItemsLayout, defStyleAttr, 0);
+                R.styleable.SuwSetupWizardRecyclerLayout, defStyleAttr, 0);
         final int xml = a.getResourceId(
-                R.styleable.SuwSetupWizardRecyclerItemsLayout_android_entries, 0);
+                R.styleable.SuwSetupWizardRecyclerLayout_android_entries, 0);
         if (xml != 0) {
             final ItemGroup inflated = (ItemGroup) new ItemInflater(context).inflate(xml);
             mAdapter = new RecyclerItemAdapter(inflated);
             mAdapter.setHasStableIds(a.getBoolean(
-                    R.styleable.SuwSetupWizardRecyclerItemsLayout_suwHasStableIds, false));
+                    R.styleable.SuwSetupWizardRecyclerLayout_suwHasStableIds, false));
             setAdapter(mAdapter);
         }
         int dividerInset = a.getDimensionPixelSize(
-                R.styleable.SuwSetupWizardRecyclerItemsLayout_suwDividerInset, 0);
+                R.styleable.SuwSetupWizardRecyclerLayout_suwDividerInset, 0);
         if (dividerInset == 0) {
             dividerInset = getResources()
                     .getDimensionPixelSize(R.dimen.suw_items_icon_divider_inset);