Updated class names and rebuilt/pushed.