Clean up move handlers and rename