Naming covention related changes