Refactor to account for how containers work

Names have to use underscores, not slashes