Fix overlay bug
Use eval-after
Rename file to match package name