Renamed the bucket classes and interface to clear up things