Happier with the renames