Rename rootkit plus small refactor