Rename to not use abbreviation