Changed removed abbreviations for rect struct