Fixes for rename of filename attribute.