Update for language changes
Update for language changes
rename: const -> static