Removed old declaration
added new naming convention