Small fix + renaming