Moved filename code to .common