Merge "Revert the package name to the old location's ones" into lmp-docs