Changed static strings to better naming convention