diff --git a/lib/components/board.dart b/lib/components/board.dart
index 6b71a3c..5502030 100644
--- a/lib/components/board.dart
+++ b/lib/components/board.dart
@@ -9,7 +9,7 @@
 
 import 'dart:math' as math;
 
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 
 const double defaultBoardHeight = 400.0;
 const double defaultBoardWidth = 400.0;
diff --git a/lib/components/card.dart b/lib/components/card.dart
index 8e38f9d..d316eb2 100644
--- a/lib/components/card.dart
+++ b/lib/components/card.dart
@@ -4,7 +4,7 @@
 
 import '../logic/card.dart' as logic_card;
 
-import 'package:sky/widgets_next.dart' as widgets;
+import 'package:sky/widgets.dart' as widgets;
 import 'package:vector_math/vector_math.dart' as vector_math;
 
 class Card extends widgets.StatelessComponent {
diff --git a/lib/components/card_collection.dart b/lib/components/card_collection.dart
index df7e295..9a508ad 100644
--- a/lib/components/card_collection.dart
+++ b/lib/components/card_collection.dart
@@ -6,7 +6,7 @@
 import 'card.dart' as component_card;
 
 import 'dart:math' as math;
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:sky/material.dart' as material;
 
 enum Orientation { vert, horz, fan, show1, suit }
diff --git a/lib/components/croupier.dart b/lib/components/croupier.dart
index 24bb137..8db6eb1 100644
--- a/lib/components/croupier.dart
+++ b/lib/components/croupier.dart
@@ -7,7 +7,7 @@
 import 'game.dart' as component_game;
 import 'croupier_settings.dart' show CroupierSettingsComponent;
 
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 
 import 'dart:sky' as sky;
 
@@ -25,8 +25,8 @@
 class CroupierComponentState extends State<CroupierComponent> {
   sky.Size screenSize;
 
-  void initState(_) {
-    super.initState(_);
+  void initState() {
+    super.initState();
     // TODO(alexfandrianto): sky.view.width and sky.view.height?
   }
 
diff --git a/lib/components/croupier_settings.dart b/lib/components/croupier_settings.dart
index b553326..3c301ff 100644
--- a/lib/components/croupier_settings.dart
+++ b/lib/components/croupier_settings.dart
@@ -5,7 +5,7 @@
 import '../logic/croupier.dart' as logic_croupier;
 import '../logic/croupier_settings.dart' show CroupierSettings, RandomSettings;
 
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 
 typedef void NoArgCb();
 typedef void OneStringCb(String data);
@@ -42,8 +42,8 @@
 class CroupierSettingsComponentState extends State<CroupierSettingsComponent> {
   Map<String, String> _tempData = new Map<String, String>();
 
-  void initState(_) {
-    super.initState(_);
+  void initState() {
+    super.initState();
 
     _initializeTemp();
   }
diff --git a/lib/components/game.dart b/lib/components/game.dart
index 1c89bce..12bcc63 100644
--- a/lib/components/game.dart
+++ b/lib/components/game.dart
@@ -11,7 +11,7 @@
 import 'card_collection.dart'
     show CardCollectionComponent, DropType, Orientation, AcceptCb;
 
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:sky/material.dart' as material;
 
 part 'hearts/hearts.part.dart';
@@ -31,8 +31,8 @@
 }
 
 abstract class GameComponentState<T extends GameComponent> extends State<T> {
-  void initState(_) {
-    super.initState(_);
+  void initState() {
+    super.initState();
 
     config.game.updateCallback = update;
   }
diff --git a/lib/main.dart b/lib/main.dart
index 680f411..48ccd5b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:sky/material.dart' show Colors;
 
 import 'logic/croupier.dart' show Croupier;
@@ -18,8 +18,8 @@
 class CroupierAppState extends State<CroupierApp> {
   Croupier croupier;
 
-  void initState(_) {
-    super.initState(_);
+  void initState() {
+    super.initState();
     this.croupier = new Croupier();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index ca52314..588b490 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: your_app_name
+name: croupier
 dependencies:
   sky: any
   sky_tools: any