5,madigan6: Refactored class names and conventions for list adapters