Revert "Revert "rename linux-conf- files""

This reverts commit 233b3af3b39844a7aaf874292406b0f3db59a5f6.