Fixed #9: source format and function rename in extra spec support