Split static variable to definition and usage, rename class access to class usage