Small fix + rename