I don't have strong opinion on this. Written as "@return Bucket" makes sense while "@return Object" doesn't, ...  But consistency is also important. Current comments are descriptive enough, though.