version using Om, more consistent file names