Properties naming fix