Some naming fix and the next/previews methods