Made it smarter (when jumping back to the same buffer via a non-aplicable buffer) + rename