Update fin alias; Remove use of reserved word