Rename some vars. Replace short tags