fixes #5183 - renaming files to support the system to content-host change
fixes #5183 - fixing bugs