Some renaming. Added shadows.